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)
Conflicts:
arch/sh/kernel/vmlinux.lds.S


Trivial merge