Merge branch 'aufs3.11/00base' into aufs3.12/00base
Merge "Merge branch 'aufs3.11/00base' into aufs3.12/00base" into distrotech-linux-3.14