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: a988f60 be82cd9)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 04:42:11 +0000 (14:42 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 04:42:11 +0000 (14:42 +1000)
commit	fd722bfedd9598383990c6e0f43b5245d111c656
tree	56000fc001ff69845e3c1978b838db4fa1ba41a1	tree \| snapshot
parent	a988f60a891b11e71823e376df4199f95da12c84	commit \| diff
parent	be82cd9aed78e2c090576a4fc2f3bb557fda6719	commit \| diff

Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/arm/kernel/Makefile
kernel/futex.c

16 files changed:

Documentation/kernel-per-CPU-kthreads.txt	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ixp4xx/common.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall32-o32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/mce.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mcheck/therm_throt.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mtrr/main.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/twl4030-irq.c	diff1 \|	diff2 \|	blob \| history
fs/exec.c	diff1 \|	diff2 \|	blob \| history
include/linux/kernel.h	diff1 \|	diff2 \|	blob \| history
include/linux/ktime.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/cpuset.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/generic-chip.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/irqdomain.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules