git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b9e0e5a
bcf8c7e
)
Merge branch 'at91/cleanup' into next/drivers
author
Arnd Bergmann
<arnd@arndb.de>
Thu, 20 Nov 2014 13:02:34 +0000
(14:02 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Thu, 20 Nov 2014 13:02:34 +0000
(14:02 +0100)
This resolves some of the obvious conflicts between the at91 cleanup and
drivers branches.
Conflicts:
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
drivers/rtc/Kconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff