From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Feb 2010 00:08:36 +0000 (-0800)
Subject: Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v2.6.33-rc7~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c031d52cac3fa4b05cf59cd03e9328790f4d4496;p=~shefty%2Frdma-dev.git

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/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
---

c031d52cac3fa4b05cf59cd03e9328790f4d4496