git://developer.intra2net.com / libi2ncommon / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f110af1 38a4e94)
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)
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


Trivial merge
libi2ncommon: Common functions used in Intra2net programs