tree 86df8df80f790645c098dd9701f6b02f178c9d2a
parent 64651309a1f0de3da131c8dc1d279c932fa979c7
parent c5dec9fb248e3318f30a26f9984b3b064053a77f
author Linus Torvalds <torvalds@g5.osdl.org> 1162871549 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1162871549 -0800

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel
  V4L/DVB (4784): [saa7146_i2c] short_delay mode fixed for fast machines
  V4L/DVB (4770): Fix mode switch of Compro Videomate T300
  V4L/DVB (4787): Budget-ci: Inversion setting fixed for Technotrend 1500 T
  V4L/DVB (4786): Pvrusb2: use NULL instead of 0
  V4L/DVB (4785): Budget-ci: Change DEBIADDR_IR to a safer default
  V4L/DVB (4752): DVB: Add DVB_FE_CUSTOMISE support for MT2060