]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 03:43:25 +0000 (14:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 03:43:25 +0000 (14:43 +1100)
commitb1456e3fadb7b6f615344a688576d3b1cc044b8f
tree033f483382bba6ceb0cd4253868a452b4df80689
parent90d0a5e07459bd8dff273b0a55253de898ddf79e
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