Merge branch 'nfs-server-fix' into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Fri, 3 Apr 2015 17:19:34 +0000 (19:19 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Fri, 3 Apr 2015 17:19:34 +0000 (19:19 +0200)
commit8f548dfe366e63af924e559a9275ce734a099942
tree6f4593b74a4f77c5ca0f9403899706f084bd3fcc
parent0d573e226f956e32035a41674e6f79e169305172
parent668ea5d311f10b63dd69718b9a43aa5d03029d5d
Merge branch 'nfs-server-fix' into next