tree 6f2149ab42eaadab0fc4a33dce9034588af8a08c
parent 5cf8cf4146de03de67d1a8aefbece66b65f255cc
parent b391d0f08fb0858f7d2cc034ddcca6cd0545bd7d
author Linus Torvalds <torvalds@linux-foundation.org> 1235780898 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235780898 -0800

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

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  V4L/DVB (10696): Remove outdated README for the flexcop-driver
  V4L/DVB (10695): Update Technisat card documentation
  V4L/DVB (10694): [PATCH] software IRQ watchdog for Flexcop B2C2 DVB PCI cards
  V4L/DVB (10663): soc-camera: fix S_CROP breakage on PXA and SuperH
  V4L/DVB (10659): em28xx: register device to soundcard for sysfs