summaryrefslogtreecommitdiffstats
path: root/block/blk-iopoll.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2010-04-13 20:03:21 +0200
committerJens Axboe <jens.axboe@oracle.com>2010-04-13 20:03:21 +0200
commit4facdaec1ce186e731e6baa04f074804849e9a49 (patch)
treee521fba8386bf23533cfe21ea5200e615960ec07 /block/blk-iopoll.c
parenta11cdaa7af56423a921a8bdad8f5a5f4ddca918a (diff)
parent0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff)
downloadop-kernel-dev-4facdaec1ce186e731e6baa04f074804849e9a49.zip
op-kernel-dev-4facdaec1ce186e731e6baa04f074804849e9a49.tar.gz
Merge branch 'master' into for-2.6.35
Conflicts: block/blk-cgroup.c block/cfq-iosched.c Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/blk-iopoll.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud