Merge branch 'master' of git://git.ipfire.org/ipfire-3.x

diff --cc lfs/linux
index 1c114f7ff248761e1235881a6136a3a27f3058e6,9292d897897de97f3f42e329fdc4bee1b5b9190f..5208188e17a5d66910570437cb301205c90d08ca
--- 1/lfs/linux
--- 2/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)