From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 3 Aug 2012 00:57:45 +0000 (+1000)
Subject: Merge remote-tracking branch 'net/master'
X-Git-Tag: next-20120803~62
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ede4ff1f6a7ac971cb969852a8a3d0d5b40fd78a;p=karo-tx-linux.git

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

ede4ff1f6a7ac971cb969852a8a3d0d5b40fd78a