diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-18 16:03:39 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-18 16:03:39 +1000 |
| commit | 56c8d28e4cbff20df25d9a2200ec5de928c9a235 (patch) | |
| tree | cbd8f4016115d67afab8c743d9ec5f2dbc5b81ce /arch/m68k/68360 | |
| parent | 1579db6df9eda5b8908a0a7319abb832ef7a9f37 (diff) | |
| parent | 4ace53bb3d31bb1e75d3501bd31b3f1e8585a115 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/machine_kexec_64.c
drivers/block/zram/zram_drv.c
drivers/staging/android/lowmemorykiller.c
fs/ufs/namei.c
Diffstat (limited to 'arch/m68k/68360')
0 files changed, 0 insertions, 0 deletions