Merge branch 'for-lustre' into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 19 Nov 2014 18:01:59 +0000 (13:01 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 19 Nov 2014 18:01:59 +0000 (13:01 -0500)
commite63fa0d458eb038e5f192fefde1b708718ec9190
tree28269f9ba04d555597c5b8370a7ebe03aa60ad9b
parent08d4f7722268755ee34ed1c9e8afee7dfff022bb
parentf76c23daacce0ed3da4abad9f2f421aae5108f93
Merge branch 'for-lustre' into for-next
drivers/staging/lustre/lustre/llite/file.c