]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4c15bc7 6352db9)
Merge branch 'at91/cleanup' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 13:02:34 +0000 (14:02 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 13:02:34 +0000 (14:02 +0100)
commita2580019e68603fef16f1d3b9e8816f4a693eb06
tree5e26a26694a63053cadfc177b14b4d1ce91d6254tree | snapshot
parent4c15bc7f8b9375fb83d6ec4d103d9c780b128be5commit | diff
parent6352db9e0091e4e0caf1ecdcdb92528ca4675f23commit | diff
Merge branch 'at91/cleanup' into next/drivers

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>
drivers/rtc/Kconfig diff1 | diff2 | blob | history
Linux Kernel Source Tree.