git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8fd30f7 c4853ef)

author	Jens Axboe <axboe@kernel.dk>
	Mon, 24 Oct 2011 14:20:43 +0000 (16:20 +0200)
committer	Jens Axboe <axboe@kernel.dk>
	Mon, 24 Oct 2011 14:20:43 +0000 (16:20 +0200)
commit	7770b19110f0f0cceb285fc4f2d52ca2b43202d9
tree	8c23eaeaa2b59a04b409fc576757f4849e49b8bc	tree \| snapshot
parent	8fd30f769edd0bc489ee5235f37978f714742ce2	commit \| diff
parent	c4853efec665134b2e6fc9c13447323240980351	commit \| diff

Merge branch 'for-3.2/drivers' into for-next

Conflicts:
drivers/block/loop.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>

block/genhd.c	diff1 \|	diff2 \|	blob \| history
drivers/block/loop.c	diff1 \|	diff2 \|	blob \| history
drivers/block/xen-blkback/xenbus.c	diff1 \|	diff2 \|	blob \| history
drivers/block/xen-blkfront.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/hpsa.c	diff1 \|	diff2 \|	blob \| history
fs/block_dev.c	diff1 \|	diff2 \|	blob \| history
include/linux/loop.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules