Merge branch 'soc' into boards
authorSimon Horman <horms@verge.net.au>
Thu, 8 Nov 2012 08:49:35 +0000 (17:49 +0900)
committerSimon Horman <horms@verge.net.au>
Thu, 8 Nov 2012 08:49:35 +0000 (17:49 +0900)
commitab3ff12a78a64b851ab22726ab99dca6ad37bf94
tree4340e41495528f1a1dc733b45a792617ff4e8992
parent631a7b5d958d2ef2c2333b105794c693642f0641
parent2944628607f76e4755660cd710f22a4748ef88d8
Merge branch 'soc' into boards

Conflicts:
arch/arm/configs/marzen_defconfig
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/board-mackerel.c