]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-3.2/core' into for-next
authorJens Axboe <axboe@kernel.dk>
Wed, 21 Sep 2011 08:21:02 +0000 (10:21 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 21 Sep 2011 08:21:02 +0000 (10:21 +0200)
commitf51dfafcc7d29d6696be769ffd810fc1df375d84
treef334ac1d23d30d5fae41e1c94a4a3a48c90fe57d
parent5250384679da7db2a7ac5cddbead861dfc01db07
parent499337bb6511e665a236a6a947f819d98ea340c6
Merge branch 'for-3.2/core' into for-next

Conflicts:
block/blk-core.c
include/linux/blkdev.h
block/blk-core.c
block/blk-sysfs.c
drivers/block/loop.c
include/linux/blkdev.h