diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 11:27:13 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 11:27:13 +0200 |
| commit | 7109561524dc57b95fd3f9b61547268b9b6db8ed (patch) | |
| tree | df08f565b2c616b7e68fe35cd428a8c5ba3bfcb1 /drivers/md/dm-flakey.c | |
| parent | ARM: 8124/1: don't enter kgdb when userspace executes a kgdb break instruction (diff) | |
| parent | ARM: add comments to the early page table remap code (diff) | |
| download | linux-7109561524dc57b95fd3f9b61547268b9b6db8ed.tar.xz linux-7109561524dc57b95fd3f9b61547268b9b6db8ed.zip | |
Merge branches 'fixes' and 'misc' into for-next
Conflicts:
arch/arm/kernel/iwmmxt.S
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
Diffstat (limited to 'drivers/md/dm-flakey.c')
0 files changed, 0 insertions, 0 deletions