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


Trivial merge