]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 100e98c bbe1fae)
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)
commit821cddf5b40b003f0f53bb09447d40e7cbff8a05
tree18cf276c8c0d64c5011784b814db586c0d5476cbtree | snapshot
parent100e98c9ab5da5a45142b9f4fb084e9dfc6fd54bcommit | diff
parentbbe1fae4d32f80259cdb71f86445aa93defc811fcommit | 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.