tree e4295e94c2000d03bf934095f7b0fa5b8b39a79f
parent 2b1f5c3ac3ebcf9d1cb3f87b4fd929201324e2bb
parent 691c9ae099b9bcb5c27125af00a4a90120977458
author Linus Torvalds <torvalds@linux-foundation.org> 1265656030 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1265656030 -0800

Merge branch 'v4l_for_linus' of git://linuxtv.org/fixes

* '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