diff options
| author | Jens Axboe <axboe@kernel.dk> | 2011-10-19 16:30:42 +0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2011-10-19 16:30:42 +0400 |
| commit | 5c04b426f2e8b46cfc7969a35b2631063a3c646c (patch) | |
| tree | 2d27d9f5d2fe5d5e8fbc01a467ec58bcb50235c1 /arch/arm/kernel/swp_emulate.c | |
| parent | 499337bb6511e665a236a6a947f819d98ea340c6 (diff) | |
| parent | 899e3ee404961a90b828ad527573aaaac39f0ab1 (diff) | |
| download | linux-5c04b426f2e8b46cfc7969a35b2631063a3c646c.tar.xz | |
Merge branch 'v3.1-rc10' into for-3.2/core
Conflicts:
block/blk-core.c
include/linux/blkdev.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'arch/arm/kernel/swp_emulate.c')
0 files changed, 0 insertions, 0 deletions