aboutsummaryrefslogtreecommitdiffstats
path: root/block/compat_ioctl.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-05-22 20:28:35 +0200
committerJens Axboe <jens.axboe@oracle.com>2009-05-22 20:28:35 +0200
commit9bd7de51ee8537094656149eaf45338cadb7d7d4 (patch)
treea691987319dfcdb07de2bce619746f88d26882c4 /block/compat_ioctl.c
parente4b636366c00738b9609cda307014d71b1225b7f (diff)
parent6a44587ee716ac911082cbdec766e5b3f051c071 (diff)
downloadmrst-s0i3-test-9bd7de51ee8537094656149eaf45338cadb7d7d4.tar.gz
mrst-s0i3-test-9bd7de51ee8537094656149eaf45338cadb7d7d4.tar.xz
mrst-s0i3-test-9bd7de51ee8537094656149eaf45338cadb7d7d4.zip
Merge branch 'master' into for-2.6.31
Conflicts: drivers/ide/ide-io.c Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/compat_ioctl.c')
0 files changed, 0 insertions, 0 deletions