From: Michael Tremer Date: Sun, 5 Apr 2009 15:26:52 +0000 (+0200) Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=426ccec73ba4249012b133720e95e4d8f36a7b43;p=ipfire-3.x.git Merge branch 'master' of git://git.ipfire.org/ipfire-3.x --- 426ccec73ba4249012b133720e95e4d8f36a7b43 diff --cc lfs/linux index 1c114f7ff,9292d8978..5208188e1 --- a/lfs/linux +++ b/lfs/linux @@@ -69,9 -70,11 +69,10 @@@ SQUASHFS_PATCH = $(THISAPP)-squashfs3.4 ############################################################################### objects = $(DL_FILE) \ + $(AUFS_PATCH) \ $(OCF_PATCH) \ $(REISER4_PATCH) \ - $(GRSEC_PATCH) \ - $(H12Y_PATCH) + $(GRSEC_PATCH) download: $(objects)