]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit802af2ef067db9c70af748b34f83b8b203a3fb2a
tree4340e41495528f1a1dc733b45a792617ff4e8992
parent14f111a526f842ff27c3e5e9a82a4d80dc85ecdc
parent6578089682275e38f280f563ed93cf43eac538b8
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