]> 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, 28 Nov 2011 03:23:14 +0000 (14:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Nov 2011 03:23:14 +0000 (14:23 +1100)
commit7d9a1638d24e8e9835d303707c3d278531f0f0a7
tree19092627bd81cc6aed316d9c1df2f482cf300f99
parent194ec19e5466542d31ff9a7c86f221eac0ac6450
parente79d72b112f4adbb97dc1ae8f796ec9f306254a1
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/mips/kernel/perf_event_mipsxx.c
Documentation/kernel-parameters.txt
arch/arm/kernel/perf_event.c
arch/mips/kernel/perf_event_mipsxx.c
include/linux/init_task.h
kernel/sched.c