Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Paul Mundt [Wed, 4 Aug 2010 04:52:34 +0000 (13:52 +0900)]
1  2 
arch/sh/Kconfig
arch/sh/mm/init.c

diff --cc arch/sh/Kconfig
Simple merge
Simple merge