git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7135466
ba62a85
)
Merge branch 'at91/cleanup5' into next/drivers
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 8 Dec 2014 17:27:21 +0000
(18:27 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 8 Dec 2014 17:29:20 +0000
(18:29 +0100)
The at91 cleanups changed a lot of files, this merges in the
latest cleanups to resolve the conflicts
Conflicts:
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/clock.c
arch/arm/mach-at91/clock.h
drivers/rtc/Kconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff