]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 04:00:33 +0000 (14:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 04:00:33 +0000 (14:00 +1000)
commitd9f040560ef3c8550c477fab02795ea4c79a6611
tree82432bd291a2743b5254c6cf12f671da1cd6014a
parent2ceb5c1378de82fdb663354bb2632d320db64d86
parentdc71c17c4a6e4569cb00a6d6fdc1c7e4402a0e8b
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/x86/Kconfig
MAINTAINERS
Makefile
arch/Kconfig
arch/mips/Kconfig
arch/x86/Kconfig
drivers/watchdog/hpwdt.c
include/linux/sched.h
init/Kconfig
kernel/fork.c
kernel/signal.c