projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0e9b190
b30814c
)
Merge branch 'for-lsk' of git://git.linaro.org/arm/big.LITTLE/mp into lsk-v3.10-big...
author
Mark Brown
<broonie@linaro.org>
Wed, 22 Jan 2014 12:33:23 +0000
(12:33 +0000)
committer
Mark Brown
<broonie@linaro.org>
Wed, 22 Jan 2014 12:33:23 +0000
(12:33 +0000)
Conflicts:
kernel/irq/irqdesc.c
linaro/configs/big-LITTLE-MP.conf
Trivial merge