diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-12 15:36:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-12 15:36:32 +1000 |
| commit | 8881892dc3d9b34bfc4084bea552f38969621f5e (patch) | |
| tree | f97d9e82cce2a072f5cd4f983d03f41dc1e06adc /drivers/parport | |
| parent | 3261a157c41a8faf952748bf8e53118744800d96 (diff) | |
| parent | a3980f9598c603bdfe65a109d2557d53b838cc1c (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
Documentation/devicetree/bindings/rtc/abracon,abx80x.txt
arch/x86/kernel/cpu/mtrr/generic.c
arch/x86/kernel/machine_kexec_64.c
drivers/block/zram/zram_drv.c
Diffstat (limited to 'drivers/parport')
0 files changed, 0 insertions, 0 deletions