tree 3c859ee589529956c83f589ba31ce07e224b8425
parent 22be2e6e13ac09b20000582ac34d47fb0029a6da
parent 3389bb8bf76180eecaffdfa7dd5b35fa4a2ce9b5
author Jens Axboe <axboe@kernel.dk> 1332745994 +0200
committer Jens Axboe <axboe@kernel.dk> 1332745994 +0200

Merge branch 'stable/for-jens-3.4-bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-3.4/drivers

Konrad writes:

I've two small fixes for the xen-blkback - and I think one more will show up
eventually (a partial revert), but not sure when. So in the spirit of keeping
the patches flowing, please git pull the following branch.