summaryrefslogtreecommitdiff
path: root/drivers/media/tuners/si2157.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-07-21 22:31:17 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-21 22:31:17 +0400
commit6890ad4b3889e13c919108d16b6fdd8d4a118de5 (patch)
tree0fc20ec6a1fcaccbb5764acda276d1e4f633940d /drivers/media/tuners/si2157.c
parentd6e6c48e5dafd77a3caf42844b59ee459fae1285 (diff)
parent3b3a1814d1703027f9867d0f5cbbfaf6c7482474 (diff)
downloadlinux-6890ad4b3889e13c919108d16b6fdd8d4a118de5.tar.xz
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "Final block fixes for 3.16 Four small fixes that should go into 3.16, have been queued up for a bit and delayed due to vacation and other euro duties. But here they are. The pull request contains: - Fix for a reported crash with shared tagging on SCSI from Christoph - A regression fix for drbd. From Lars Ellenberg. - Hooking up the compat ioctl for BLKZEROOUT, which requires no translation. From Mikulas. - A fix for a regression where we woud crash on queue exit if the root_blkg is gone/not there. From Tejun" * 'for-linus' of git://git.kernel.dk/linux-block: block: provide compat ioctl for BLKZEROOUT blkcg: don't call into policy draining if root_blkg is already gone drbd: fix regression 'out of mem, failed to invoke fence-peer helper' block: don't assume last put of shared tags is for the host
Diffstat (limited to 'drivers/media/tuners/si2157.c')
0 files changed, 0 insertions, 0 deletions