]> Pileus Git - ~andy/linux/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Mon, 9 Jan 2012 00:56:37 +0000 (09:56 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 9 Jan 2012 00:56:37 +0000 (09:56 +0900)
commit04cf399640b7acfa9abe2eb7900cd934db8af697
treef9a055f2f0170550f5f0b0507b06ffce8d98945d
parent17f0056e6a2f3d1818801705f5e12b71217bf4ef
parenta0e86bd4252519321b0d102dc4ed90557aa7bee9
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest

Conflicts:
arch/arm/mach-shmobile/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/include/mach/common.h