diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 14:02:34 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 14:02:34 +0100 |
| commit | 4b3d4d3d2d69c29c09c38dbc99b4e2225724955a (patch) | |
| tree | 5e26a26694a63053cadfc177b14b4d1ce91d6254 /Kbuild | |
| 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>
Diffstat (limited to 'Kbuild')
0 files changed, 0 insertions, 0 deletions