diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-29 21:29:12 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-29 21:29:12 +1000 |
| commit | e4eacbea9a418a88bc4a2b44db5ed6b2250afde0 (patch) | |
| tree | 50760896ecca78281df27906769fa19b670dc805 /block/blk-ioc.c | |
| parent | c12d56184d6f6526261d6b1811ddc63aa8db8b1d (diff) | |
| parent | 8c169d94c31fced71d907e26b19b4f5f0bd9d7bf (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/kernel/machine_kexec_64.c
drivers/staging/android/lowmemorykiller.c
Diffstat (limited to 'block/blk-ioc.c')
0 files changed, 0 insertions, 0 deletions