Merge branch 'pci_id_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...
commit4a72ef9f7ad36ea0fb3b42f31b2b0c5b9871969a
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Apr 2008 23:12:24 +0000 (6 16:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Apr 2008 23:12:24 +0000 (6 16:12 -0700)
tree70794a6bc589cf8e0bf99d9e71e90d151810c4a3
parent28b8383d5d4d9b636c3734c993563bafdc2ab3c3
parent92c9d07507f0a90b64172bfede7e6fa845e8e66b
Merge branch 'pci_id_updates' of git://git./linux/kernel/git/mchehab/v4l-dvb

* 'pci_id_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (7497): pvrusb2: add new usb pid for 73xxx models
  V4L/DVB (7496): pvrusb2: add new usb pid for 75xxx models