Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

Browse source

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

...

This commit is contained in:

Linus Torvalds 2010-02-03 16:08:36 -08:00

parent c1c0cbb878 ba9e9f3c08

commit c031d52cac

2 changed files with 5 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/media/common/saa7146_video.c

View file

8

drivers/media/video/saa7134/saa7134-empress.c

View file