Merge branch 'powersave' (kernel 2.6.33)
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Mon, 10 May 2010 14:23:58 +0000 (16:23 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Mon, 10 May 2010 14:23:58 +0000 (16:23 +0200)
commite32a2c2d2bfdb9a35966ff238da9f0155af8128c
tree66ff8bb5d4e4472ed27b96b998f41be12319ae7f
parentf110af11d2b7ce881ab55c00f8f89b52b8066744
parent38a4e948f00e5d7de8a46d1ab3457bcf371375f9
Merge branch 'powersave' (kernel 2.6.33)

Conflicts:
miscscripts/miscscripts.spec
packages/buildsys-build-rpmfusion/buildsys-build-rpmfusion-kerneldevpkgs-current
packages/kernel/kernel-2.6.32.10-i686-smp.config
packages/kernel/kernel-2.6.32.10-i686.config
packages/kernel/kernel-2.6.32.12-i686-smp.config
packages/kernel/kernel-2.6.32.12-i686.config
packages/kernel/kernel-2.6.33.3-i686-smp.config
packages/kernel/kernel-2.6.33.3-i686.config
packages/kernel/kernel.spec