git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 466987c 8213538)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 25 Oct 2012 02:50:12 +0000 (13:50 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 25 Oct 2012 02:50:12 +0000 (13:50 +1100)
commit	9ad55dd75f7ee615e1a64218973af6252b9ac733
tree	70670a35c0be76b7e7c81eaedeb9b1381e7a0644	tree \| snapshot
parent	466987cffb0be7a978f7b45f9e49c677b5b90bf3	commit \| diff
parent	8213538e4f17369b1df63b2825215b2360c30398	commit \| diff

Merge remote-tracking branch 'signal/for-next'

Conflicts:
arch/alpha/kernel/osf_sys.c

arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/m68k/include/asm/unistd.h	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/mips_ksyms.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-n32.S	diff1 \|	diff2 \|	blob \| history
arch/parisc/include/asm/unistd.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/unistd.h	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/entry64.S	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules