]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'stable/for-jens-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJens Axboe <axboe@fb.com>
Wed, 8 Apr 2015 02:00:45 +0000 (20:00 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 8 Apr 2015 02:00:45 +0000 (20:00 -0600)
commit976f2ab4985a1dbe3f3f0777ce01d4fdb404c62a
treee547cdb36108923c0fd61ee8d72c6deba6a2b5cc
parenta67a95134ffddd0ca4527c77e86375c3deb2938f
parent77387b82d1b2bada25a7b566ab7716408fedc5e9
Merge branch 'stable/for-jens-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-4.1/drivers

Konrad writes:

This pull has one fix and an cleanup.

Note that David Vrabel in the xen/tip.git tree has other changes for the
Xen block drivers that are related to his grant work - and they do not
conflict with this git pull.