]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 02:56:23 +0000 (13:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 02:56:23 +0000 (13:56 +1100)
commit11ee2667feeb666d6af3b4da80b50e7e49a152ec
treeb836dde7cf53f4ff802d48f17505e1ddf90dfe3b
parent985a5c35b9b6426fc562a8176cb6769d3b242ff7
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