From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 7 Oct 2012 22:41:44 +0000 (+1100)
Subject: Merge remote-tracking branch 'net/master'
X-Git-Tag: next-20121008~83
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=89f69c225b383fd9139b81063bad23f693ffc555;p=karo-tx-linux.git

Merge remote-tracking branch 'net/master'
---

89f69c225b383fd9139b81063bad23f693ffc555