Linus Torvalds
14a3c4ab0e
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm ...
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (407 commits)
[ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices
[ARM] pxafb: cleanup of the timing checking code
[ARM] pxafb: cleanup of the color format manipulation code
[ARM] pxafb: add palette format support for LCCR4_PAL_FOR_3
[ARM] pxafb: add support for FBIOPAN_DISPLAY by dma braching
[ARM] pxafb: allow pxafb_set_par() to start from arbitrary yoffset
[ARM] pxafb: allow video memory size to be configurable
[ARM] pxa: add document on the MFP design and how to use it
[ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant
[ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant
[ARM] pxa/tavorevb: update board support (smartpanel LCD + keypad)
[ARM] pxa: Update eseries defconfig
[ARM] 5352/1: add w90p910-plat config file
[ARM] s3c: S3C options should depend on PLAT_S3C
[ARM] mv78xx0: implement GPIO and GPIO interrupt support
[ARM] Kirkwood: implement GPIO and GPIO interrupt support
[ARM] Orion: share GPIO IRQ handling code
[ARM] Orion: share GPIO handling code
[ARM] s3c: define __io using the typesafe version
[ARM] S3C64XX: Ensure CPU_V6 is selected
...
2008-12-30 17:36:49 -08:00
Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
2008-12-18 22:15:30 +00:00
Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im into devel
2008-12-25 00:13:35 +00:00
include /asm
Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
2008-12-18 22:15:30 +00:00
Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel
2008-12-19 19:46:52 +00:00
Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel
2008-12-19 19:46:52 +00:00
Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6 into devel
2008-12-17 20:04:45 +00:00
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-12-30 17:36:49 -08:00
[ARM] Kirkwood: implement GPIO and GPIO interrupt support
2008-12-20 12:26:57 -05:00
[ARM] mv78xx0: implement GPIO and GPIO interrupt support
2008-12-20 12:27:13 -05:00
[ARM] MXC: remove dependency to other include files from irqs.h
2008-12-18 16:40:11 +01:00
[ARM] MXC: remove dependency to other include files from irqs.h
2008-12-18 16:40:11 +01:00
[ARM] MXC: do not include mach/hardware.h from mach/memory.h
2008-12-18 16:40:14 +01:00
Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel
2008-12-19 19:46:52 +00:00
Merge branch 'hsmmc-init' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
2008-12-17 20:03:39 +00:00
[ARM] Orion: share GPIO IRQ handling code
2008-12-20 12:24:05 -05:00
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2008-12-30 17:36:49 -08:00
mach-s3c24a0/include /mach
[ARM] S3C24A0: Remove duplicate <mach/io.h> file
2008-12-18 16:35:59 +00:00
[ARM] S3C: Remove unnecessary <linux/delay.h> includes
2008-12-18 16:36:02 +00:00
[ARM] S3C: Remove unnecessary <linux/delay.h> includes
2008-12-18 16:36:02 +00:00
Merge branch 'next-s3c64xx-device' into next-merged
2008-12-18 16:17:37 +00:00
[ARM] S3C: Remove unnecessary <linux/delay.h> includes
2008-12-18 16:36:02 +00:00
[ARM] S3C64XX: Remove __virt_to_bus/__bus_to_virt macros
2008-12-18 16:35:54 +00:00
Merge branch 'next-s3c64xx-device' into next-merged
2008-12-18 16:17:37 +00:00
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
2008-12-29 18:08:11 +00:00
Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6 into devel
2008-12-17 20:04:45 +00:00
[ARM] MXC: do not include mach/hardware.h from mach/memory.h
2008-12-18 16:40:14 +01:00
Merge branch 'hsmmc-init' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
2008-12-17 20:03:39 +00:00
[ARM] Orion: share GPIO IRQ handling code
2008-12-20 12:24:05 -05:00
[ARM] s3c: S3C options should depend on PLAT_S3C
2008-12-21 15:02:07 +00:00
[ARM] S3C: Remove unnecessary <linux/delay.h> includes
2008-12-18 16:36:02 +00:00
[ARM] S3C64XX: Ensure CPU_V6 is selected
2008-12-18 22:06:42 +00:00
[ARM] 5349/1: VFP: Add PM code to save and restore current VFP state
2008-12-18 21:21:34 +00:00
Merge git://git.marvell.com/orion into devel
2008-12-20 17:40:03 +00:00
Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
2008-12-18 22:15:30 +00:00
14a3c4ab0e