Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Wed, 4 Aug 2010 04:52:34 +0000 (13:52 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 4 Aug 2010 04:52:34 +0000 (13:52 +0900)
commitbaea90ea14b316e4599f000c713e446908a5aef6
tree17eae40f15832b466121d8f962028472c4568a13
parent36239c6704b71da7fb8e2a9429e159a84d0c5a3e
parent3a09b1be53d23df780a0cd0e4087a05e2ca4a00c
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
arch/sh/Kconfig
arch/sh/mm/init.c