git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
21c27ca
138e8f1
)
Merge branch 'at91/cleanup' into next/dt
author
Arnd Bergmann
<arnd@arndb.de>
Fri, 23 May 2014 20:59:20 +0000
(22:59 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Fri, 23 May 2014 21:02:30 +0000
(23:02 +0200)
Conflicts:
arch/arm/boot/dts/at91sam9rl.dtsi
Needed as a dependency for the at91/dt2 branch
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge