Merge branch 'kernel-update'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Fri, 21 Jan 2011 16:04:33 +0000 (17:04 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Fri, 21 Jan 2011 16:04:33 +0000 (17:04 +0100)
commitcd7bdcf43b916179514631bdcdd9551df5d166bd
tree998bad7e0ad4ff9e16b0491c8c4abe4fa6e24ac9
parenta3296c11082bd0359db7225d0b21c8ed9e768bc6
parent3395ec0cf47c241f7eec9e87019b9d043007933f
Merge branch 'kernel-update'

Conflicts:
miscscripts/miscscripts.spec
packages/buildsys-build-rpmfusion/buildsys-build-rpmfusion-kerneldevpkgs-current