Merge branch 'stable/for-jens-3.16' of git://git.kernel.org/pub/scm/linux/kernel...
authorJens Axboe <axboe@fb.com>
Wed, 28 May 2014 18:37:04 +0000 (12:37 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 28 May 2014 18:37:04 +0000 (12:37 -0600)
commit879466e6a53ce063fa779476cf648abafcd703a9
treedc0827609f020f237cd201b8e0345bdef2b17190
parent0fb662e2250afdf2c54253dbf2063dc9d8369b69
parent814d04e7dfc4a9cf7e36656afe2da5c0c08dde2b
Merge branch 'stable/for-jens-3.16' of git://git./linux/kernel/git/xen/tip into for-3.16/drivers

Konrad writes:

Please git pull the following branch:

git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git stable/for-jens-3.16

which has a bunch of fixes to the Xen block frontend and backend driver
and a new parameter for Xen backend driver - an override (set by the toolstack)
whether to expose the discard support (if disk of course supports it) or not.
drivers/block/xen-blkfront.c