Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 09:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
664a41b8a9
linux/arch/arm/mach-shmobile
History
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
..
include/mach Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-07-24 10:20:54 -07:00
board-ag5evm.c ARM: mach-shmobile: ag5evm: consistently name sdhi info structures 2011-06-21 17:49:43 +09:00
board-ap4evb.c 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
board-g3evm.c ARM: mach-shmobile: remove sh7367 on-chip set_irq_type() 2011-01-18 13:51:57 +09:00
board-g4evm.c ARM: mach-shmobile: Correct the G4EVM SDHI0 I/O range. 2011-05-25 14:54:30 +09:00
board-mackerel.c 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
clock-sh73a0.c ARM: mach-shmobile: sh73a0 DMA Engine support for SY-DMAC 2011-05-25 11:36:51 +09:00
clock-sh7367.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock-sh7372.c ARM: mach-shmobile: sh7372: make sure that fsi is peripheral of spu2 2011-07-10 10:11:57 +02:00
clock-sh7377.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock.c ARM: mach-shmobile: Clock framework comment fix 2010-08-18 16:31:00 +09:00
console.c ARM: mach-shmobile: early console support using earlyprintk 2010-02-09 10:34:12 +09:00
cpuidle.c ARM: mach-shmobile: CPUIdle support 2011-05-25 11:19:23 +09:00
entry-gic.S ARM: mach-shmobile: update for GIC changes. 2011-01-07 12:02:11 +09:00
entry-intc.S ARM: mach-shmobile: Run-time IRQ handler for INTCA 2011-01-07 10:42:50 +09:00
headsmp.S ARM: mach-shmobile: headsmp.S build fix 2011-05-24 12:29:14 +09:00
hotplug.c ARM: mach-shmobile: SMP base support 2010-12-14 18:15:44 +09:00
intc-sh73a0.c ARM: mach-shmobile: sh73a0 gic_arch_extn.irq_set_wake() fix 2011-06-14 15:12:05 +09:00
intc-sh7367.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
intc-sh7372.c ARM: arch-shmobile: Use multiple irq vectors for SDHI 2011-05-24 12:42:46 +09:00
intc-sh7377.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
Kconfig ARM: mach-shmobile: AG5EVM LCDC / MIPI-DSI platform data 2011-01-20 21:34:32 +09:00
localtimer.c ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime 2011-02-23 17:54:27 +00:00
Makefile ARM: mach-shmobile: CPUIdle support 2011-05-25 11:19:23 +09:00
Makefile.boot
pfc-sh73a0.c ARM: mach-shmobile: sh73a0 GPIO pullup improvement 2010-12-22 16:35:50 +09:00
pfc-sh7367.c ARM: mach-shmobile: sh7367 and G3EVM pinmux support 2010-02-12 14:10:47 +09:00
pfc-sh7372.c ARM: mach-shmobile: pfc-sh7372: modify wrong comment 2010-09-14 17:20:13 +09:00
pfc-sh7377.c ARM: mach-shmobile: pfc-sh7377: modify KEYIN settings 2010-02-23 11:17:30 +09:00
platsmp.c ARM: 6993/1: platsmp: Allow secondary cpu hotplug with maxcpus=1 2011-07-07 14:45:07 +01:00
pm_runtime.c ARM / shmobile: Use pm_genpd_poweroff_unused() 2011-07-13 12:32:07 +02:00
pm-sh7372.c ARM / shmobile: Return -EBUSY from A4LC power off if A3RV is active 2011-07-14 20:59:35 +02:00
setup-sh73a0.c ARM: mach-shmobile: sh73a0 DMA Engine support for SY-DMAC 2011-05-25 11:36:51 +09:00
setup-sh7367.c ARM: mach-shmobile: Correct SCIF port types for SH7367. 2011-06-14 15:12:09 +09:00
setup-sh7372.c ARM: mach-shmobile: sh7372 D4 support 2011-07-10 10:38:22 +02:00
setup-sh7377.c ARM: mach-shmobile: sh7377 UIO platform data V3 2011-05-24 12:19:30 +09:00
sleep-sh7372.S ARM: mach-shmobile: sh7372 Core Standby Suspend-to-RAM 2011-05-25 11:19:20 +09:00
smp-sh73a0.c ARM: mach-shmobile: sh73a0 twd_base fix 2011-05-24 12:31:17 +09:00
suspend.c ARM: mach-shmobile: Suspend-to-RAM support 2011-05-25 11:19:17 +09:00
timer.c