aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-13 13:44:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-13 13:44:32 -0700
commitebcbf1664cda2bb504a3c5c1ced114daf4ddf54b (patch)
tree3390cc1b7a428078337aa2e737440f6479fd673e /drivers/net
parentMerge tag 'for-linus-4.2-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip (diff)
parentMerge branch 'stable/for-jens-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus (diff)
downloadlinux-dev-ebcbf1664cda2bb504a3c5c1ced114daf4ddf54b.tar.xz
linux-dev-ebcbf1664cda2bb504a3c5c1ced114daf4ddf54b.zip
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 'drivers/net')
0 files changed, 0 insertions, 0 deletions