diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-13 23:44:32 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-13 23:44:32 +0300 |
commit | ebcbf1664cda2bb504a3c5c1ced114daf4ddf54b (patch) | |
tree | 3390cc1b7a428078337aa2e737440f6479fd673e /net/bridge | |
parent | 6b476e114061599a6ab8d5464a5e16989cb98653 (diff) | |
parent | e162b219ae6a64be353f254bd4ba1c9627c67749 (diff) | |
download | linux-ebcbf1664cda2bb504a3c5c1ced114daf4ddf54b.tar.xz |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull xen block driver fixes from Jens Axboe:
"A few small bug fixes for xen-blk{front,back} that have been sitting
over my vacation"
* 'for-linus' of git://git.kernel.dk/linux-block:
xen-blkback: replace work_pending with work_busy in purge_persistent_gnt()
xen-blkfront: don't add indirect pages to list when !feature_persistent
xen-blkfront: introduce blkfront_gather_backend_features()
Diffstat (limited to 'net/bridge')
0 files changed, 0 insertions, 0 deletions