From: J. Bruce Fields Date: Mon, 2 Feb 2015 16:29:29 +0000 (-0500) Subject: Merge branch 'locks-3.20' of git://git.samba.org/jlayton/linux into for-3.20 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a584143b01ce69803116ae8d0a4db382acc728d7;p=linux-beck.git 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. --- a584143b01ce69803116ae8d0a4db382acc728d7