tree db3d7519932549bf528f5b8e4cb8350356cd544d
parent 79ed2a9216dd3cc35c4f2c5dbaddadb195af83ac
parent 0cfd81031a26717fe14380d18275f8e217571615
author Paul Mundt <lethal@linux-sh.org> 1224469072 +0900
committer Paul Mundt <lethal@linux-sh.org> 1224469072 +0900

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

Conflicts:

	Documentation/kernel-parameters.txt
	arch/sh/include/asm/elf.h