Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 9 Oct 2008 20:31:54 +0000 (21:31 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Oct 2008 20:31:54 +0000 (21:31 +0100)
commit90bb28b0644f7324f8bd1feb27b35146e6785ba2
tree18885d181ca21fdd66abd8a3db3498ab3d7ea21c
parentb4ffb0edf4ed9cef77031dceeaa21d1b66076600
parent3bca103a1e658d23737d20e1989139d9ca8973bf
parent446b097a426f0fa7d37bd2576bdf6d72d6483ac1
parent8e6c81fe289e90b188203ec1db1dc2f3e992ebde
parent0ac4ed9d76400e7c073b9d81cea13f8613d24361
parentbda03086093d4535e39ee8a6120e3fbb73e83b1a
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel
15 files changed:
arch/arm/mach-ep93xx/adssphere.c
arch/arm/mach-ep93xx/core.c
arch/arm/mach-ep93xx/edb9302.c
arch/arm/mach-ep93xx/edb9302a.c
arch/arm/mach-ep93xx/edb9307.c
arch/arm/mach-ep93xx/edb9312.c
arch/arm/mach-ep93xx/edb9315.c
arch/arm/mach-ep93xx/edb9315a.c
arch/arm/mach-ep93xx/gesbc9312.c
arch/arm/mach-ep93xx/gpio.c
arch/arm/mach-ep93xx/micro9.c
arch/arm/mach-ep93xx/ts72xx.c
arch/arm/mach-ks8695/gpio.c
arch/arm/mach-ks8695/pci.c
arch/arm/mach-sa1100/pleb.c