Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion
Russell King [Sun, 7 Nov 2010 16:10:56 +0000 (16:10 +0000)]
1  2 
arch/arm/mach-kirkwood/common.c
arch/arm/mach-kirkwood/d2net_v2-setup.c
arch/arm/mach-kirkwood/netspace_v2-setup.c
arch/arm/mach-kirkwood/netxbig_v2-setup.c
arch/arm/mach-kirkwood/ts41x-setup.c
arch/arm/mach-orion5x/ts78xx-setup.c

Simple merge
Simple merge
Simple merge