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)
commitbbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301
tree071fa9f86dc04a16570be367d04cff3b00c694ad
parent57682827b9a5edb52e33af0be9082b51bffcd5c7
parentda5cabf80e2433131bf0ed8993abc0f7ea618c73
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/Kconfig
arch/sh/include/asm/Kbuild
drivers/Makefile
drivers/i2c/busses/i2c-sh_mobile.c
drivers/serial/sh-sci.h