diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-22 12:33:23 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-22 12:33:23 +0000 |
| commit | 2305009118181260b45aab82f14bcbb659953ef1 (patch) | |
| tree | 0c2c9469d7ae37f38449116971bf16b10355e19c /fs/ext2 | |
| parent | 0e9b1909c3c660060d94a0a8a15c5299de97a4aa (diff) | |
| parent | b30814c74c184bbb231e24d6c857699af338468b (diff) | |
Merge branch 'for-lsk' of git://git.linaro.org/arm/big.LITTLE/mp into lsk-v3.10-big.LITTLEv3.10/topic/big.LITTLE
Conflicts:
kernel/irq/irqdesc.c
linaro/configs/big-LITTLE-MP.conf
Diffstat (limited to 'fs/ext2')
0 files changed, 0 insertions, 0 deletions