Merge branch 'origin' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 28 Mar 2009 20:29:51 +0000 (20:29 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 28 Mar 2009 20:29:51 +0000 (20:29 +0000)
commited40d0c472b136682b2fcba05f89762859c7374f
tree076b83a26bcd63d6158463735dd34c10bbc591dc
parent9e495834e59ca9b29f1a1f63b9f5533bb022ac49
parent5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a
Merge branch 'origin' into devel

Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
26 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
arch/arm/mach-kirkwood/common.c
arch/arm/mach-kirkwood/rd88f6281-setup.c
arch/arm/mach-pxa/e740.c
arch/arm/mach-pxa/e750.c
arch/arm/mach-pxa/h5000.c
arch/arm/mach-pxa/include/mach/regs-ssp.h
arch/arm/mach-pxa/spitz.c
drivers/ata/pata_icside.c
drivers/net/arm/ixp4xx_eth.c
drivers/net/smc91x.h
drivers/spi/omap2_mcspi.c
drivers/spi/omap_uwire.c
drivers/spi/pxa2xx_spi.c
drivers/watchdog/sa1100_wdt.c
lib/Kconfig.debug
sound/arm/pxa2xx-ac97-lib.c
sound/arm/pxa2xx-ac97.c
sound/soc/pxa/corgi.c
sound/soc/pxa/poodle.c
sound/soc/pxa/pxa-ssp.c
sound/soc/pxa/pxa2xx-ac97.c
sound/soc/pxa/pxa2xx-i2s.c
sound/soc/pxa/spitz.c
sound/soc/pxa/tosa.c