| commit | a584143b01ce69803116ae8d0a4db382acc728d7 | [log] [tgz] |
|---|---|---|
| author | J. Bruce Fields <bfields@redhat.com> | Mon Feb 02 11:29:29 2015 -0500 |
| committer | J. Bruce Fields <bfields@redhat.com> | Mon Feb 02 11:29:29 2015 -0500 |
| tree | 002733709647fa1e17683a9d21dbc23ae99e3d2d | |
| parent | 4c94e13e9caed09103419c087f436d79f9d2faba [diff] | |
| parent | 8116bf4cb62d337c953cfa5369ef4cf83e73140c [diff] |
Merge branch 'locks-3.20' of git://git.samba.org/jlayton/linux into for-3.20 Christoph's block pnfs patches have some minor dependencies on these lock patches.