Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Wed, 16 Sep 2009 04:48:32 +0000 (13:48 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 16 Sep 2009 04:48:32 +0000 (13:48 +0900)
commitea88023b3491a384575ebcd5e8a449e841a28a24
treef46e3d8302e44dc55ce31823501e100472d29683
parenta6f15ade97989d414e9bf33874c9d5d1f39808ec
parent0cb583fd2862f19ea88b02eb307d11c09e51e2f8
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
arch/sh/kernel/vmlinux.lds.S
Documentation/kernel-parameters.txt
arch/sh/kernel/signal_32.c
arch/sh/kernel/signal_64.c
arch/sh/kernel/vmlinux.lds.S
drivers/input/keyboard/sh_keysc.c
drivers/video/Kconfig