linux/arch/arm/mach-shmobile
Linus Torvalds acff987d94 Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6
* 'fbdev-next' of git://github.com/schandinat/linux-2.6: (270 commits)
  video: platinumfb: Add __devexit_p at necessary place
  drivers/video: fsl-diu-fb: merge diu_pool into fsl_diu_data
  drivers/video: fsl-diu-fb: merge diu_hw into fsl_diu_data
  drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported
  drivers/video: fsl-diu-fb: remove unused panel operating mode support
  drivers/video: fsl-diu-fb: use an enum for the AOI index
  drivers/video: fsl-diu-fb: add several new video modes
  drivers/video: fsl-diu-fb: remove broken screen blanking support
  drivers/video: fsl-diu-fb: move some definitions out of the header file
  drivers/video: fsl-diu-fb: fix some ioctls
  video: da8xx-fb: Increased resolution configuration of revised LCDC IP
  OMAPDSS: picodlp: add missing #include <linux/module.h>
  fb: fix au1100fb bitrot.
  mx3fb: fix NULL pointer dereference in screen blanking.
  video: irq: Remove IRQF_DISABLED
  smscufx: change edid data to u8 instead of char
  OMAPDSS: DISPC: zorder support for DSS overlays
  OMAPDSS: DISPC: VIDEO3 pipeline support
  OMAPDSS/OMAP_VOUT: Fix incorrect OMAP3-alpha compatibility setting
  video/omap: fix build dependencies
  ...

Fix up conflicts in:
 - drivers/staging/xgifb/XGI_main_26.c
	Changes to XGIfb_pan_var()
 - drivers/video/omap/{lcd_apollon.c,lcd_ldp.c,lcd_overo.c}
	Removed (or in the case of apollon.c, merged into the generic
	DSS panel in drivers/video/omap2/displays/panel-generic-dpi.c)
2011-10-30 15:30:01 -07:00
..
include/mach Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-ag5evm.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 2011-10-28 14:16:11 -07:00
board-ap4evb.c Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
board-g3evm.c ARM: mach-shmobile: Setup consistent dma size at boot time 2011-08-22 12:00:12 +00:00
board-g4evm.c ARM: mach-shmobile: Setup consistent dma size at boot time 2011-08-22 12:00:12 +00:00
board-mackerel.c Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 2011-10-30 15:30:01 -07:00
clock-sh73a0.c ARM: mach-shmobile: clock-sh73a0: tidyup CKSCR main clock selecter 2011-08-29 16:22:39 +09:00
clock-sh7367.c sh: move CLKDEV_xxx_ID macro to sh_clk.h 2011-07-11 15:07:25 +09:00
clock-sh7372.c Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x 2011-08-29 13:37:17 -07:00
clock-sh7377.c sh: move CLKDEV_xxx_ID macro to sh_clk.h 2011-07-11 15:07:25 +09:00
clock.c
console.c
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: gic: consolidate PPI handling 2011-10-23 13:32:29 +01: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: mach-shmobile: sh7372 A4R support (v4) 2011-10-22 00:20:12 +02: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 ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pfc-sh73a0.c ARM: mach-shmobile: sh73a0 GPIO pullup improvement 2010-12-22 16:35:50 +09:00
pfc-sh7367.c
pfc-sh7372.c
pfc-sh7377.c
platsmp.c ARM: smp: fix clipping of number of CPUs 2011-10-20 22:06:57 +01:00
pm_runtime.c PM: Move clock-related definitions and headers to separate file 2011-08-25 15:34:19 +02:00
pm-sh7372.c ARM: mach-shmobile: sh7372 A4R support (v4) 2011-10-22 00:20:12 +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 A4R support (v4) 2011-10-22 00:20:12 +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 sleep warning fixes 2011-09-25 23:21:02 +02: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