diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 17:42:29 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 17:42:29 +1000 |
| commit | 460f7ed52f4292f25871946ba5aa5fec24447682 (patch) | |
| tree | 43fb9c5460f0fb41112552021bafaa16ec7b4136 /arch/arm/mach-mvebu/kirkwood.c | |
| parent | ce8a8285d33e9bb40373939a85a3629ce815c2f8 (diff) | |
| parent | 929c76e4e6292770322822a50e08b8feaa4afbbf (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/arm64/Kconfig
drivers/rapidio/devices/tsi721_dma.c
kernel/kexec.c
Diffstat (limited to 'arch/arm/mach-mvebu/kirkwood.c')
0 files changed, 0 insertions, 0 deletions