Merge commit 'origin/master' into next

Conflicts:
	lfs/libevent2
	lfs/transmission
	src/paks/transmission/install.sh
	src/paks/transmission/uninstall.sh
This commit is contained in:
Arne Fitzenreiter
2011-10-02 21:27:09 +02:00
12 changed files with 140 additions and 8 deletions

View File

@@ -0,0 +1,6 @@
lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm.ko
lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-amd.ko
lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-intel.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-amd.ko
lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-intel.ko

View File

@@ -26,7 +26,7 @@
#
# Remove old core updates from pakfire cache to save space...
core=52
core=53
for (( i=1; i<=$core; i++ ))
do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire