| commit | 1ff5125fb85a46279421350eeaf812f728784d35 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <jaxboe@fusionio.com> | Fri Nov 12 08:47:04 2010 +0100 |
| committer | Jens Axboe <jaxboe@fusionio.com> | Fri Nov 12 08:47:04 2010 +0100 |
| tree | e795ca6d427d136ea097f756eea8ea5cff1c4055 | |
| parent | cedb4a7d9f6aedb0dce94d6285b69dcb3c10fa05 [diff] | |
| parent | dcb8baeceaa1c629bbd06f472cea023ad08a0c33 [diff] |
Merge branch 'upstream/blkfront' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into for-linus Conflicts: drivers/block/xen-blkfront.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>