]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cputime/cputime'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 05:10:58 +0000 (16:10 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 05:10:58 +0000 (16:10 +1100)
commited7cbf6862b00f39f9bc8138826c1c451582980d
treec4d0bf0fc2c33fdc44b7897f2f5d67279db60c37
parentb86da173440faac9b21cdac2ebb7f1751e04dba5
parentc3e0ef9a298e028a82ada28101ccd5cf64d209ee
Merge remote-tracking branch 'cputime/cputime'

Conflicts:
arch/powerpc/include/asm/cputime.h
arch/powerpc/include/asm/cputime.h
drivers/cpufreq/cpufreq_ondemand.c
kernel/fork.c