tree 071fa9f86dc04a16570be367d04cff3b00c694ad
parent 57682827b9a5edb52e33af0be9082b51bffcd5c7
parent da5cabf80e2433131bf0ed8993abc0f7ea618c73
author Paul Mundt <lethal@linux-sh.org> 1281933144 +0900
committer Paul Mundt <lethal@linux-sh.org> 1281933144 +0900

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

Conflicts:
	arch/sh/include/asm/Kbuild
	drivers/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>