From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2015 00:15:20 +0000 (+1100)
Subject: Merge remote-tracking branch 'orangefs/for-next'
X-Git-Tag: KARO-TXUL-2015-12-04~117
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=e6b81abe2d9940cf210adb0799b6aabc1622d822

Merge remote-tracking branch 'orangefs/for-next'
---

e6b81abe2d9940cf210adb0799b6aabc1622d822