linux/arch/sh/boards
Linus Torvalds 664a41b8a9 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (430 commits)
  [media] ir-mce_kbd-decoder: include module.h for its facilities
  [media] ov5642: include module.h for its facilities
  [media] em28xx: Fix DVB-C maxsize for em2884
  [media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
  [media] v4l: mt9v032: Fix Bayer pattern
  [media] V4L: mt9m111: rewrite set_pixfmt
  [media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
  [media] V4L: initial driver for ov5642 CMOS sensor
  [media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
  [media] V4L: soc-camera: remove soc-camera bus and devices on it
  [media] V4L: soc-camera: un-export the soc-camera bus
  [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
  [media] V4L: add media bus configuration subdev operations
  [media] V4L: soc-camera: group struct field initialisations together
  [media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
  [media] V4L: pxa-camera: switch to using standard PM hooks
  [media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
  [media] Don't OOPS if videobuf_dvb_get_frontend return NULL
  [media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
  [media] omap3isp: Support configurable HS/VS polarities
  ...

Fix up conflicts:
 - arch/arm/mach-omap2/board-rx51-peripherals.c:
     cleanup regulator supply definitions in mach-omap2
   vs
     OMAP3: RX-51: define vdds_csib regulator supply
 - drivers/staging/tm6000/tm6000-alsa.c (trivial)
2011-07-30 00:08:53 -07:00
..
mach-ap325rxa Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-07-30 00:08:53 -07:00
mach-cayman sh: Convert to new function names 2011-03-29 14:48:13 +02:00
mach-dreamcast Fix common misspellings 2011-03-31 11:26:23 -03:00
mach-ecovec24 Merge branch 'master' into for-next 2011-07-11 14:15:55 +02:00
mach-highlander ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
mach-hp6xx suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
mach-kfr2r09 SH: static should be at beginning of declaration 2011-07-11 14:13:46 +02:00
mach-landisk sh: landisk: Remove whitespace 2011-03-31 15:22:31 +09:00
mach-lboxre2 sh: Convert p3_ioremap() users to ioremap_prot(). 2010-01-19 13:55:41 +09:00
mach-microdev sh: Convert to new function names 2011-03-29 14:48:13 +02:00
mach-migor SH: static should be at beginning of declaration 2011-07-11 14:13:46 +02:00
mach-r2d sh: Use device_initcall() instead of __initcall() 2011-01-11 12:47:45 +09:00
mach-rsk sh: mach-rsk: Add polled GPIO buttons support for RSK+7203. 2010-12-13 15:33:16 +09:00
mach-sdk7780 sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
mach-sdk7786 sh: Use device_initcall() instead of __initcall() 2011-01-11 12:47:45 +09:00
mach-se SH: static should be at beginning of declaration 2011-07-11 14:13:46 +02:00
mach-sh03 Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 2011-01-13 10:39:38 -08:00
mach-sh7763rdp sh: modify platform_device for sh_eth driver 2011-03-17 16:52:44 +09:00
mach-x3proto sh: Convert to new function names 2011-03-29 14:48:13 +02:00
board-apsh4a3a.c sh: Add support for AP-SH4A-3A board. 2011-01-13 18:32:42 +09:00
board-apsh4ad0a.c sh: Add support for AP-SH4AD-0A board. 2011-01-13 18:36:21 +09:00
board-edosk7705.c sh: Use device_initcall() instead of __initcall() 2011-01-11 12:47:45 +09:00
board-edosk7760.c sh: Conver to asm-generic/sizes.h. 2011-03-22 22:43:09 +09:00
board-espt.c sh: modify platform_device for sh_eth driver 2011-03-17 16:52:44 +09:00
board-magicpanelr2.c sh: Convert to new function names 2011-03-29 14:48:13 +02:00
board-polaris.c sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
board-secureedge5410.c sh: machvec IO death. 2010-11-01 09:49:04 -04:00
board-sh2007.c sh: SH-2007 board support. 2010-06-21 15:10:51 +09:00
board-sh7757lcr.c sh: fix build error in board-sh7757lcr.c 2011-03-31 15:47:38 +09:00
board-sh7785lcr.c sh: Use device_initcall() instead of __initcall() 2011-01-11 12:47:45 +09:00
board-shmin.c sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
board-titan.c sh: mach-titan: Kill off unused PIO port mangling. 2010-01-28 15:08:21 +09:00
board-urquell.c sh: Move platform smp ops in to their own structure. 2010-04-21 12:23:25 +09:00
Kconfig sh: Add support for AP-SH4AD-0A board. 2011-01-13 18:36:21 +09:00
Makefile sh: Add support for AP-SH4AD-0A board. 2011-01-13 18:36:21 +09:00