From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Nov 2011 23:22:36 +0000 (+1100)
Subject: Merge remote-tracking branch 'nfs/linux-next'
X-Git-Tag: next-20111116~55
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3d444ea2d9e7ce9e68a6bcc13ef549eae5e39b5e;p=karo-tx-linux.git

Merge remote-tracking branch 'nfs/linux-next'
---

3d444ea2d9e7ce9e68a6bcc13ef549eae5e39b5e