]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1560ebc a405a0c)
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)
commitd8786c99691e08f6a4ee79492393a96ce8a95e3f
tree5e26a26694a63053cadfc177b14b4d1ce91d6254tree | snapshot
parent1560ebca1bdb6a0a79ec6c74f6ff47e655f73a7ecommit | diff
parenta405a0ce67f8eedc577af16ed48e9e181142d5d6commit | 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.