Merge branch 'upstream/blkfront' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJens Axboe <jaxboe@fusionio.com>
Fri, 12 Nov 2010 07:47:04 +0000 (08:47 +0100)
committerJens Axboe <jaxboe@fusionio.com>
Fri, 12 Nov 2010 07:47:04 +0000 (08:47 +0100)
commit1ff5125fb85a46279421350eeaf812f728784d35
treee795ca6d427d136ea097f756eea8ea5cff1c4055
parentcedb4a7d9f6aedb0dce94d6285b69dcb3c10fa05
parentdcb8baeceaa1c629bbd06f472cea023ad08a0c33
Merge branch 'upstream/blkfront' of git://git./linux/kernel/git/jeremy/xen into for-linus

Conflicts:
drivers/block/xen-blkfront.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>