Russell King 4b60e5f90d Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

..

boot

Merge first four commits of 'zImage_fixes' of git://git.linaro.org/people/nico/linux into fixes

2011-05-07 08:34:40 +01:00

common

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

configs

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

include/asm

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

kernel

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

lib

Merge branches 'fixes', 'pgt-next' and 'versatile' into devel

2011-03-20 09:32:12 +00:00

mach-at91

at91: Add ARCH_ID and basic cpu macros definition for 5series chips family.

2011-04-23 11:03:07 +08:00

mach-bcmring

ARM: bcmring: convert to use sp804 clockevents

2011-05-23 18:04:54 +01:00

mach-clps711x

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

mach-cns3xxx

ARM: P2V: separate PHYS_OFFSET from platform definitions

2011-02-17 23:26:55 +00:00

mach-davinci

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-dove

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

mach-ebsa110

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

mach-ep93xx

Fix common misspellings

2011-03-31 11:26:23 -03:00

mach-exynos4

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-footbridge

clocksource: convert footbridge to generic i8253 clocksource

2011-05-14 10:29:48 +01:00

mach-gemini

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

mach-h720x

ARM: Replace platform definition of ISA_DMA_THRESHOLD/MAX_DMA_ADDRESS

2011-05-12 08:36:49 +01:00

mach-imx

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

2011-03-28 18:52:44 +01:00

mach-integrator

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-iop13xx

Fix common misspellings

2011-03-31 11:26:23 -03:00

mach-iop32x

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

mach-iop33x

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

mach-ixp4xx

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-ixp23xx

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

mach-ixp2000

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

mach-kirkwood

Fix common misspellings

2011-03-31 11:26:23 -03:00

mach-ks8695

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

mach-l7200/include/mach

arm: return both physical and virtual addresses from addruart

2010-10-20 00:27:33 -04:00

mach-loki

Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm

2011-03-17 19:08:06 -07:00

mach-lpc32xx

clocksource: convert ARM 32-bit up counting clocksources

2011-05-23 18:04:51 +01:00

mach-mmp

ARM: mmp: align NR_BUILTIN_GPIO with gpio interrupt number

2011-04-12 23:26:39 +08:00

mach-msm

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-mv78xx0

arm: Cleanup the irq namespace

2011-03-29 14:47:57 +02:00

mach-mx3

ARM: imx: fix usb related build failure for mach-vpr200

2011-04-12 09:47:55 +02:00

mach-mx5

ARM: mx5/mx53_loco: Fix build warning related to gpio_keys_button structure

2011-04-18 19:51:14 +02:00

mach-mxc91231

ARM: mxc91231/iomux: allow pin_list to be const

2011-03-07 19:29:28 +01:00

mach-mxs

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-netx

clocksource: convert ARM 32-bit up counting clocksources

2011-05-23 18:04:51 +01:00

mach-nomadik

ARM: P2V: separate PHYS_OFFSET from platform definitions

2011-02-17 23:26:55 +00:00

mach-ns9xxx

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

mach-nuc93x

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

mach-omap1

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-omap2

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-orion5x

Fix common misspellings

2011-03-31 11:26:23 -03:00

mach-pnx4008

arm: Cleanup the irq namespace

2011-03-29 14:47:57 +02:00

mach-pxa

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-realview

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-rpc

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

mach-s3c24a0/include/mach

ARM: P2V: separate PHYS_OFFSET from platform definitions

2011-02-17 23:26:55 +00:00

mach-s3c64xx

ARM / Samsung: Use struct syscore_ops for "core" power management

2011-04-24 19:16:10 +02:00

mach-s3c2400

ARM: P2V: separate PHYS_OFFSET from platform definitions

2011-02-17 23:26:55 +00:00

mach-s3c2410

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-s3c2412

ARM / Samsung: Use struct syscore_ops for "core" power management

2011-04-24 19:16:10 +02:00

mach-s3c2416

ARM / Samsung: Use struct syscore_ops for "core" power management

2011-04-24 19:16:10 +02:00

mach-s3c2440

ARM / Samsung: Use struct syscore_ops for "core" power management

2011-04-24 19:16:10 +02:00

mach-s3c2443

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

mach-s5p64x0

ARM: S5P64X0: Fix iodesc array size for S5P6450

2011-03-28 16:17:53 +09:00

mach-s5p6442

Merge branch 'p2v' into devel

2011-03-16 23:35:27 +00:00

mach-s5pc100

Fix common misspellings

2011-03-31 11:26:23 -03:00

mach-s5pv210

ARM / Samsung: Use struct syscore_ops for "core" power management

2011-04-24 19:16:10 +02:00

mach-sa1100

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-shark

ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizes

2011-05-12 08:36:53 +01:00

mach-shmobile

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-spear3xx

ARM: 6794/1: SPEAr: Append UL to device address macros.

2011-03-09 09:50:04 +00:00

mach-spear6xx

ARM: 6794/1: SPEAr: Append UL to device address macros.

2011-03-09 09:50:04 +00:00

mach-tcc8k

clocksource: convert ARM 32-bit up counting clocksources

2011-05-23 18:04:51 +01:00

mach-tegra

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-u300

clocksource: convert ARM 32-bit up counting clocksources

2011-05-23 18:04:51 +01:00

mach-ux500

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-versatile

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-vexpress

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

mach-vt8500

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

mach-w90x900

clocksource: convert W90x900 24-bit down counting clocksource

2011-05-23 18:04:52 +01:00

mm

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

nwfpe

Update broken web addresses in arch directory.

2010-10-18 11:03:21 +02:00

oprofile

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2011-02-15 10:18:48 -08:00

plat-iop

Merge branch 'clksrc' into devel

2011-01-05 18:09:03 +00:00

plat-mxc

clocksource: convert ARM 32-bit down counting clocksources

2011-05-23 18:04:51 +01:00

plat-nomadik

clocksource: convert ARM 32-bit down counting clocksources

2011-05-23 18:04:51 +01:00

plat-omap

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

plat-orion

clocksource: convert ARM 32-bit down counting clocksources

2011-05-23 18:04:51 +01:00

plat-pxa

ARM / PXA: Use struct syscore_ops for "core" power management

2011-04-24 19:16:09 +02:00

plat-s3c24xx

ARM / Samsung: Use struct syscore_ops for "core" power management

2011-04-24 19:16:10 +02:00

plat-s5p

ARM: s5p: consolidate selection of timer register

2011-05-23 18:04:43 +01:00

plat-samsung

ARM / Samsung: Use struct syscore_ops for "core" power management

2011-04-24 19:16:10 +02:00

plat-spear

clocksource: convert SPEAr platforms 16-bit up counting clocksource

2011-05-23 18:04:52 +01:00

plat-tcc

ARM: P2V: separate PHYS_OFFSET from platform definitions

2011-02-17 23:26:55 +00:00

plat-versatile

ARM: consolidate SMP cross call implementation

2011-05-23 16:53:17 +01:00

tools

ARM: Update (and cut down) mach-types

2011-03-20 18:07:44 +00:00

vfp

ARM: Use struct syscore_ops instead of sysdevs for PM in common code

2011-04-24 19:16:08 +02:00

Kconfig

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23 18:05:10 +01:00

Kconfig-nommu

Fix common misspellings

2011-03-31 11:26:23 -03:00

Kconfig.debug

ARM: 6876/1: Kconfig.debug: Remove unused CONFIG_DEBUG_ERRORS

2011-04-14 09:15:24 +01:00

Makefile

ARM: plat-stmp: remove plat

2011-05-02 19:08:55 +01:00