| commit | 4b3d4d3d2d69c29c09c38dbc99b4e2225724955a | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Nov 20 14:02:34 2014 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Nov 20 14:02:34 2014 +0100 |
| tree | 5e26a26694a63053cadfc177b14b4d1ce91d6254 | |
| parent | b9e0e5a9e075575cc47940da8271d4908d3ae9c3 [diff] | |
| parent | bcf8c7e7703bb2bbde66bec26a81fed4be9cd1d4 [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>