Merge remote branch 'origin/master' into dracut

Conflicts:
	lfs/dracut
This commit is contained in:
Michael Tremer
2010-07-25 22:48:28 +02:00
13 changed files with 266 additions and 34 deletions

View File

@@ -30,7 +30,7 @@ else
VERSUFIX=ipfire
endif
VER = 2.6.34
VER = 2.6.34.1
THISAPP = compat-wireless-$(VER)
DL_FILE = compat-wireless-$(VER).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 951e15df527eb89f3c9deb752c709fb3
$(DL_FILE)_MD5 = 80ceb675aeba45847258770441352af6
install : $(TARGET)