Merge branches 'master' and 'devel' into for-linus
2010-08-10 23:17:52 +01:00
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
2010-08-06 18:10:25 +01:00
Merge branches 'master' and 'devel' into for-linus
2010-08-10 23:17:52 +01:00
include /asm
archs: replace unifdef-y with header-y
2010-08-14 22:26:51 +02:00
Mark arguments to certain syscalls as being const
2010-08-13 16:53:13 -07:00
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-08-03 14:31:24 -07:00
ARM: Remove DISCONTIGMEM support
2010-07-16 10:57:35 +01:00
ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
2010-08-10 22:46:56 +01:00
ARM: AMBA: Add pclk definition for platforms using primecells
2010-07-22 09:55:38 +01:00
ARM: 6283/1: Remove useless PCIO_BASE definitions
2010-08-05 10:35:49 +01:00
ARM: cns3xxx: Add support for AHCI controllers
2010-06-08 17:37:09 +04:00
Merge branch 'for-2.6.36' into for-2.6.37
2010-08-16 18:42:58 +01:00
[ARM] Dove: platform device registration for the sdio interfaces
2010-07-16 22:01:59 -04:00
ASoC: ep93xx: add Simplemachines Sim.One AC97 audio support
2010-10-15 11:54:54 +01:00
ARM: 6233/1: Delete a wrong redundant right parenthesis
2010-07-22 09:20:50 +01:00
ARM: 6130/1: Gemini: add support for Raidsonic IB4220
2010-05-13 12:19:14 +01:00
ARM: 6283/1: Remove useless PCIO_BASE definitions
2010-08-05 10:35:49 +01:00
ARM: 6322/1: imx/pca100: Fix name of spi platform data
2010-08-10 22:11:43 +01:00
ARM: 6283/1: Remove useless PCIO_BASE definitions
2010-08-05 10:35:49 +01:00
Merge branch 'misc' into devel
2010-07-31 14:20:02 +01:00
Merge branch 'devel-stable' into devel
2010-05-17 17:24:04 +01:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
Merge git://git.infradead.org/mtd-2.6
2010-08-15 17:32:47 -07:00
ARM: 6283/1: Remove useless PCIO_BASE definitions
2010-08-05 10:35:49 +01:00
ARM: 6269/1: Add 'code' parameter for hook_fault_code()
2010-07-27 10:48:34 +01:00
ASoC: OpenRD Client : Fix naming breakage due to multicomponent support
2010-08-31 13:35:15 +01:00
ARM: 6269/1: Add 'code' parameter for hook_fault_code()
2010-07-27 10:48:34 +01:00
ARM: Remove DISCONTIGMEM support
2010-07-16 10:57:35 +01:00
ARM: LPC32XX: Arch config menu supoport and makefiles
2010-07-27 08:46:22 -07:00
[ARM] mmp: move declarations into SoC specific header file from common.h
2010-08-05 14:34:46 +08:00
Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
2010-08-12 10:07:32 -07:00
Merge branch 'origin' into devel-stable
2010-03-08 20:21:04 +00:00
ASoC: Remove -dai suffix from i.MX SSI driver
2010-10-01 00:13:28 -07:00
i.MX51: add support for cpuimx51 module and its baseboard
2010-07-26 15:05:37 +02:00
imx: move gpio init after to irq init
2010-07-26 15:05:35 +02:00
ARM: mxc91231: remove paragraphs with old address of the FSF
2010-06-30 09:00:27 +02:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
ARM: AMBA: Add pclk definition for platforms using primecells
2010-07-22 09:55:38 +01:00
ARM: 6263/1: ns9xxx: fix FTBFS for zImage
2010-07-26 10:33:07 +01:00
Merge branch 'for-2.6.36' into for-2.6.37
2010-08-16 18:42:58 +01:00
omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes
2010-10-04 20:48:36 +01:00
ARM: Fix gen_nand probe structures contents
2010-08-12 02:21:18 +01:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
Merge branch 'for-2.6.36' into for-2.6.37
2010-08-16 18:42:58 +01:00
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-08-03 14:31:24 -07:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
mach-s3c24a0/include /mach
Merge branch 'origin' into devel-stable
2010-03-08 20:21:04 +00:00
ARM: S3C64XX: Fix fallthrough bug in i2sv3 gpio configuration, improve logging
2010-08-27 11:23:27 +01:00
ARM: Convert platform reservations to use LMB rather than bootmem
2010-07-27 08:48:23 +01:00
ARM: Remove DISCONTIGMEM support
2010-07-16 10:57:35 +01:00
s3c-fb: add device name initialization
2010-08-11 08:59:10 -07:00
panic: keep blinking in spite of long spin timer mode
2010-08-11 08:59:22 -07:00
s3c-fb: add device name initialization
2010-08-11 08:59:10 -07:00
Merge branch 'next-samsung' into for-next
2010-08-06 21:49:18 +09:00
Merge branch 'next-samsung' into for-next
2010-08-06 21:49:18 +09:00
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-08-11 09:13:19 -07:00
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-08-11 09:13:19 -07:00
ARM: S5PV310: Add Samsung UNIVERSAL_C210 support
2010-08-06 21:15:52 +09:00
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
2010-08-06 18:10:25 +01:00
Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', 'spear' and 'versatile' into devel
2010-07-31 14:19:35 +01:00
ARM: mach-shmobile: Fix up ap4evb build for LCDC merge damage.
2010-08-04 16:47:37 +09:00
ARM: AMBA: Add pclk definition for platforms using primecells
2010-07-22 09:55:38 +01:00
ARM: AMBA: Add pclk definition for platforms using primecells
2010-07-22 09:55:38 +01:00
[ARM] tegra: harmony: Add harmony board file
2010-08-05 14:57:02 -07:00
ARM: 6297/1: move U300 timer to dynamic clock lookup
2010-08-10 22:10:56 +01:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2010-08-09 21:00:07 -07:00
ARM: 6282/1: Remove useless definitions from versatile hardware.h
2010-08-05 10:35:49 +01:00
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-08-03 14:31:24 -07:00
i2c/nuc900: add i2c driver support for nuc900
2010-08-11 00:34:38 +01:00
Merge branches 'master' and 'devel' into for-linus
2010-08-10 23:17:52 +01:00
ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup
2010-05-24 20:40:12 +01:00
ARM: 6074/1: oprofile: convert from sysdev to platform device
2010-05-17 11:53:59 +01:00
Merge branch 'misc' into devel
2010-07-31 14:20:02 +01:00
ASoC: Remove -dai suffix from i.MX SSI driver
2010-10-01 00:13:28 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2010-08-09 21:00:07 -07:00
Merge branch 'for-2.6.36' into for-2.6.37
2010-08-16 18:42:58 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
2010-08-07 17:07:31 -07:00
[ARM] pxa: move pmu device back into mach-pxa/
2010-08-05 14:32:19 +08:00
ARM: S3C24XX: I2S multi-component-related fixes
2010-08-31 13:25:17 +01:00
ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig
2010-08-09 18:26:13 +09:00
Merge branch 'for-2.6.36' into for-2.6.37
2010-08-16 18:42:58 +01:00
Merge branch 'master' into for-next
2010-08-04 15:14:38 +02:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
ARM: 6264/1: fix Versatile Express LED oversight
2010-07-26 10:48:34 +01:00
ARM: Update mach-types
2010-07-12 21:14:53 +01:00
ARM: 6203/1: Make VFPv3 usable on ARMv6
2010-07-09 14:41:34 +01:00
Merge branches 'master' and 'devel' into for-linus
2010-08-10 23:17:52 +01:00
Merge branches 'master' and 'devel' into for-linus
2010-08-10 23:17:52 +01:00
d42a280dc7