Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Feb 2010 00:08:36 +0000 (16:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Feb 2010 00:08:36 +0000 (16:08 -0800)
commitc031d52cac3fa4b05cf59cd03e9328790f4d4496
tree2eb148d3be46779ea30d221c10c3e67b4e31d9ed
parentc1c0cbb8781e4b684a3d902d05b01912b3a545d9
parentba9e9f3c08a5b58c1ffacf0cc6fb703ab0fa55ff
Merge branch 'v4l_for_linus' of git://git./linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  saa7146: stop DMA before de-allocating DMA scatter/gather page buffers
  V4L/DVB: saa7134: remove stray unlock_kernel