]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'v4l_for_linus' of git://linuxtv.org/fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Feb 2010 19:07:10 +0000 (11:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Feb 2010 19:07:10 +0000 (11:07 -0800)
* 'v4l_for_linus' of git://linuxtv.org/fixes:
  V4L/DVB: dvb-core: fix initialization of feeds list in demux filter
  V4L/DVB: dvb_demux: Don't use vmalloc at dvb_dmx_swfilter_packet
  V4L/DVB: Fix the risk of an oops at dvb_dmx_release


Trivial merge