]> bbs.cooldavid.org Git - net-next-2.6.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Fri, 20 Aug 2010 11:52:23 +0000 (20:52 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 20 Aug 2010 11:52:23 +0000 (20:52 +0900)
commitb9afa3e015273a52718e0a7efe198a0df76be880
tree88cf67276533fcd5622d4cc2165ba889a98bb0db
parent144c7494239f12d554806439a17ad8203c7b2d3a
parent763008c4357b73c8d18396dfd8d79dc58fa3f99d
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
arch/sh/kernel/process_32.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/include/asm/syscalls_32.h