OSDN Git Service

(root) / tomoyo / tomoyo-test1.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b9e0e5a bcf8c7e)
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)
commit4b3d4d3d2d69c29c09c38dbc99b4e2225724955a
tree5e26a26694a63053cadfc177b14b4d1ce91d6254tree | snapshot
parentb9e0e5a9e075575cc47940da8271d4908d3ae9c3commit | diff
parentbcf8c7e7703bb2bbde66bec26a81fed4be9cd1d4commit | 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
This is a test repository.
About OSDN
Find Software
Develop Software
Help