From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 Aug 2011 01:24:15 +0000 (+1000)
Subject: Merge remote-tracking branch 'nfsd/nfsd-next'
X-Git-Tag: next-20110822~60
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3be2b160c0d660e18926cd91bea2d9b5e37bb174;p=karo-tx-linux.git

Merge remote-tracking branch 'nfsd/nfsd-next'
---

3be2b160c0d660e18926cd91bea2d9b5e37bb174