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

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (345 commits)
  V4L/DVB (13542): ir-keytable: Allow dynamic table change
  V4L/DVB (13541): atbm8830: replace 64-bit division and floating point usage
  V4L/DVB (13540): ir-common: Cleanup get key evdev code
  V4L/DVB (13539): ir-common: add __func__ for debug messages
  V4L/DVB (13538): ir-common: Use a dynamic keycode table
  V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation
  V4L/DVB (13536): em28xx: Use the full RC5 code on HVR-950 Remote Controller
  V4L/DVB (13535): ir-common: Add a hauppauge new table with the complete RC5 code
  V4L/DVB (13534): ir-common: Remove some unused fields/structs
  V4L/DVB (13533): ir: use dynamic tables, instead of static ones
  V4L/DVB (13532): ir-common: Add infrastructure to use a dynamic keycode table
  V4L/DVB (13531): ir-common: rename the debug routine to allow exporting it
  V4L/DVB (13458): go7007: subdev conversion
  V4L/DVB (13457): s2250: subdev conversion
  V4L/DVB (13456): s2250: Change module structure
  V4L/DVB (13528): em28xx: add support for em2800 VC211A card
  em28xx: don't reduce scale to half size for em2800
  em28xx: don't load audio modules when AC97 is mis-detected
  em28xx: em2800 chips support max width of 640
  V4L/DVB (13523): dvb-bt8xx: fix compile warning
  ...

Fix up trivial conflicts due to spelling fixes from the trivial tree in
	Documentation/video4linux/gspca.txt
	drivers/media/video/cx18/cx18-mailbox.h

diff --cc Documentation/DocBook/v4l/videodev2.h.xml
Simple merge

diff --cc Documentation/video4linux/gspca.txt
index 6b29555b58b7056191b193a532a826d047245895,546667024f5420bf4ac914d509598b805faefa11..319d9838e87e0ffbd1f35945c84d8c1ff1c38d3c
--- 1/Documentation/video4linux/gspca.txt
--- 2/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@@ -6,7 -6,8 +6,8 @@@ The modules are
  
  xxxx          vend:prod
  ----
 -spca501               0000:0000       MystFromOri Unknow Camera
 +spca501               0000:0000       MystFromOri Unknown Camera
+ spca508               0130:0130       Clone Digital Webcam 11043
  m5602         0402:5602       ALi Video Camera Controller
  spca501               040a:0002       Kodak DVC-325
  spca500               040a:0300       Kodak EZ200

diff --cc drivers/media/dvb/frontends/au8522_decoder.c
Simple merge

diff --cc drivers/media/radio/Kconfig
Simple merge

diff --cc drivers/media/radio/Makefile
Simple merge

diff --cc drivers/media/radio/radio-mr800.c
Simple merge

diff --cc drivers/media/video/cx18/cx18-mailbox.h
index 522ad534034cb066a96a587d461dc9d098caa5e6,5ea07359904c306590c44f59af6922c257ed3052..33a3491c45374a1128eb8ec8e09e1e91450bc769
--- 1/drivers/media/video/cx18/cx18-mailbox.h
--- 2/drivers/media/video/cx18/cx18-mailbox.h
+++ b/drivers/media/video/cx18/cx18-mailbox.h
@@@ -39,9 -39,9 +39,9 @@@
  struct cx18;
  
  /*
-  * This structure is used by CPU to provide completed buffers information
-  * Its structure is dictrated by the layout of the SCB, required by the
+  * This structure is used by CPU to provide completed MDL & buffers information.
+  * Its structure is dictated by the layout of the SCB, required by the
 - * firmware, but its defintion needs to be here, instead of in cx18-scb.h,
 + * firmware, but its definition needs to be here, instead of in cx18-scb.h,
   * for mailbox work order scheduling
   */
  struct cx18_mdl_ack {

diff --cc drivers/media/video/cx23885/cx23885-dvb.c
Simple merge

diff --cc drivers/media/video/gspca/sonixb.c
Simple merge

diff --cc drivers/media/video/gspca/spca500.c
Simple merge

diff --cc drivers/media/video/gspca/spca501.c
Simple merge

diff --cc drivers/media/video/gspca/sunplus.c
Simple merge

diff --cc drivers/media/video/gspca/zc3xx.c
Simple merge

diff --cc drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
Simple merge

diff --cc drivers/media/video/s2255drv.c
Simple merge

diff --cc include/linux/videodev2.h
Simple merge