From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 23 Oct 2012 00:18:58 +0000 (+1100)
Subject: Merge remote-tracking branch 'nfs/linux-next'
X-Git-Tag: next-20121023~72
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b069f17dde4a8b1a3740d0ee4b683dec3cc52e5e;p=karo-tx-linux.git

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

b069f17dde4a8b1a3740d0ee4b683dec3cc52e5e