git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5768282 da5cabf)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Mon, 16 Aug 2010 04:32:24 +0000 (13:32 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 16 Aug 2010 04:32:24 +0000 (13:32 +0900)
Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile

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

Trivial merge
Pandora Kernel Repository