From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Mon, 10 May 2010 14:23:58 +0000 (+0200)
Subject: Merge branch 'powersave' (kernel 2.6.33)
X-Git-Tag: v2.6~108
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=e32a2c2d2bfdb9a35966ff238da9f0155af8128c;p=libi2ncommon

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
---

e32a2c2d2bfdb9a35966ff238da9f0155af8128c