Merge /home/v4l/v4l/patchwork

Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork: (42 commits)
  [media] s5h1420: Unused variable clock_setting
  [media] stv090x: variable 'no_signal' set but not used
  [media] stv0367: variable 'tps_rcvd' set but not used
  [media] saa7164: Variable set but not used
  [media] pvrusb2: Variables set but not used
  [media] cx231xx: Paranoic stack memory save
  [media] [trivial] v4l drivers: typo, change ctruct to struct in comment
  [media] stradis: remove unused V4L1 headers
  [media] em28xx: Improve support for the Terratec Cinergy HTC Stick HD
  [media] em28xx: Add the DRX-K at I2C address 0x29 to the list of known I2C devices
  [media] Add support for downloading the firmware of the Terratec Cinergy HTC Stick HD's firmware
  [media] radio-sf16fmi: Use LM7000 driver
  [media] radio-aimslab: Use LM7000 driver
  [media] radio: Add Sanyo LM7000 tuner driver
  [media] em28xx: Make a few drxk_config structs static
  [media] em28xx: Remove unused AC97 register definitions
  [media] em28xx: Rename AC97 registers to use sound/ac97_codec.h definitions
  [media] em28xx: Fix wrong AC97 mic register usage
  [media] zr364xx: add suspend/resume support
  [media] zr364xx: allow multiple opens
  ...

Conflicts:
	drivers/media/video/em28xx/em28xx-cards.c