]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 02:13:33 +0000 (13:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 02:13:33 +0000 (13:13 +1100)
commite74f848af73f5e8b6536a4660a2dc17ab233a39e
treef96602c4c9483d2fd40a7cf7a763f89e0d254c36
parent4d0545112e9e4d1144f4a09ebb9d49d5da0b9a4f
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