diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
| commit | ca4b95e91b33e5b8f02a063862359ab00c5260d5 (patch) | |
| tree | 872d6a54fa0e59e017aa3101880d82f0e54fb70a /kernels/linux-libre-aufs_friendly/ext4-options.patch | |
| parent | 041ebdb9062909e39f81cca8c491c7f8adeed2a3 (diff) | |
| parent | 2ed96c6eb798c762b61a93a8b4cf80220c00ac1f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/libvirt/PKGBUILD
community/opendkim/opendkim.rc
core/nfs-utils/blkmapd.service
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-qt/PKGBUILD
testing/php/PKGBUILD
testing/xorg-server/PKGBUILD
~fauno/notmuch/PKGBUILD
Diffstat (limited to 'kernels/linux-libre-aufs_friendly/ext4-options.patch')
| -rw-r--r-- | kernels/linux-libre-aufs_friendly/ext4-options.patch | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernels/linux-libre-aufs_friendly/ext4-options.patch b/kernels/linux-libre-aufs_friendly/ext4-options.patch index ef1b2417d..ea48c384b 100644 --- a/kernels/linux-libre-aufs_friendly/ext4-options.patch +++ b/kernels/linux-libre-aufs_friendly/ext4-options.patch @@ -47,3 +47,4 @@ index 502c61f..30de9cd 100644 default: ext4_msg(sb, KERN_ERR, "Unrecognized mount option \"%s\" " + |