]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'signal/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 05:34:09 +0000 (16:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 05:34:09 +0000 (16:34 +1100)
commitdab25023bebfb5a3f24d23301eb398884c17bd3e
treebaedff43e93d303f1de3bd918f861e1693eea4d5
parentd1ca670910d8a271d8c13b85c4493e1aee94780a
parente9b3e96faa1e145f2fa1fad74827f8c53e111739
Merge remote-tracking branch 'signal/for-next'

Conflicts:
arch/sparc/kernel/sys_sparc_64.c
12 files changed:
arch/mips/Kconfig
arch/mips/kernel/mips_ksyms.c
arch/mips/kernel/scall64-n32.S
arch/powerpc/include/asm/unistd.h
arch/s390/kernel/entry64.S
arch/sparc/include/asm/processor_64.h
arch/sparc/include/asm/thread_info_64.h
arch/sparc/kernel/process_64.c
arch/sparc/kernel/sys_sparc_64.c
arch/sparc/kernel/systbls_64.S
drivers/staging/gdm72xx/gdm_usb.c
include/linux/sched.h