diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-01 18:06:55 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-01 18:06:55 +1000 |
| commit | 4353c9537752e2102f1d4e69afe28818f7568009 (patch) | |
| tree | 685a7da163ca6539f44c9a8466c24f551e1b9fe2 /mm/fremap.c | |
| parent | 8eb4f12135473b8b35fef57f33761fed3d1b2e5a (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 'mm/fremap.c')
0 files changed, 0 insertions, 0 deletions