Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into...

diff --cc arch/arm/mach-ep93xx/adssphere.c
Simple merge

diff --cc arch/arm/mach-ep93xx/core.c
Simple merge

diff --cc arch/arm/mach-ep93xx/edb9302.c
Simple merge

diff --cc arch/arm/mach-ep93xx/edb9302a.c
Simple merge

diff --cc arch/arm/mach-ep93xx/edb9307.c
Simple merge

diff --cc arch/arm/mach-ep93xx/edb9312.c
Simple merge

diff --cc arch/arm/mach-ep93xx/edb9315.c
Simple merge

diff --cc arch/arm/mach-ep93xx/edb9315a.c
Simple merge

diff --cc arch/arm/mach-ep93xx/gesbc9312.c
Simple merge

diff --cc arch/arm/mach-ep93xx/gpio.c
Simple merge

diff --cc arch/arm/mach-ep93xx/micro9.c
Simple merge

diff --cc arch/arm/mach-ep93xx/ts72xx.c
Simple merge

diff --cc arch/arm/mach-ks8695/gpio.c
Simple merge

diff --cc arch/arm/mach-ks8695/pci.c
Simple merge

diff --cc arch/arm/mach-sa1100/pleb.c
Simple merge