aboutsummaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2012-03-26 09:13:14 +0200
committerJens Axboe <axboe@kernel.dk>2012-03-26 09:13:14 +0200
commit6674fb79ca9c19f5ee3d4cd683da2d9e09cfc9b8 (patch)
tree3c859ee589529956c83f589ba31ce07e224b8425 /include/media
parent22be2e6e13ac09b20000582ac34d47fb0029a6da (diff)
parent3389bb8bf76180eecaffdfa7dd5b35fa4a2ce9b5 (diff)
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.
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions