]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5abcc05 7f3e389)
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)
commitc06330545a391b4331c1e98a1d864cc423da551c
tree18cf276c8c0d64c5011784b814db586c0d5476cbtree | snapshot
parent5abcc059d164599595563d1e39b73c4b7f5421f6commit | diff
parent7f3e3893afe0c34472d8edbb144945eff1e0c885commit | 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
Linux Kernel Source Tree.