Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Mon, 20 Oct 2008 02:17:52 +0000 (11:17 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 20 Oct 2008 02:17:52 +0000 (11:17 +0900)
commit4cb40f795af36b3deb743f6ccf6c3fd542c61c8d
treedb3d7519932549bf528f5b8e4cb8350356cd544d
parent79ed2a9216dd3cc35c4f2c5dbaddadb195af83ac
parent0cfd81031a26717fe14380d18275f8e217571615
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:

Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h
Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h
arch/sh/kernel/smp.c
drivers/net/sh_eth.c
drivers/rtc/rtc-sh.c