projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7135466 ba62a85)
Merge branch 'at91/cleanup5' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Mon, 8 Dec 2014 17:27:21 +0000 (18:27 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 8 Dec 2014 17:29:20 +0000 (18:29 +0100)
commit5db45002576f7d60c5bf7b23e277845cd3e806be
tree18cf276c8c0d64c5011784b814db586c0d5476cbtree | snapshot
parent7135466151f0560604c2bfc4c27ff9cc2a40f8cdcommit | diff
parentba62a8593d15f3f353acdc8ab32c18dd40a275bbcommit | diff
Merge branch 'at91/cleanup5' into next/drivers

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>
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/Kconfig diff1 | diff2 | blob | history
drivers/rtc/Kconfig diff1 | diff2 | blob | history
John Crispins staging tree