Merge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxa
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 9 Jul 2008 19:56:05 +0000 (20:56 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 9 Jul 2008 19:56:05 +0000 (20:56 +0100)
commitfdc614e873bc56ed15d8f4e9fa33516cd0915fc2
tree9e0a4fd586bbb6913094ebac9af2955914371bdc
parentbdb08cb2d3491d441dd403dfb88d90ba90fb7232
parentc0f7edb3099d538017c52556aab596b857dc92ee
parent9fc697b0b01416edae99dd9c5c49fb69c9282744
Merge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxa
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/devices.c
arch/arm/mach-pxa/lpd270.c
arch/arm/mach-pxa/magician.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa3xx.c
drivers/i2c/busses/i2c-pxa.c