tree f46e3d8302e44dc55ce31823501e100472d29683
parent a6f15ade97989d414e9bf33874c9d5d1f39808ec
parent 0cb583fd2862f19ea88b02eb307d11c09e51e2f8
author Paul Mundt <lethal@linux-sh.org> 1253076512 +0900
committer Paul Mundt <lethal@linux-sh.org> 1253076512 +0900

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/sh/kernel/vmlinux.lds.S