From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 27 May 2013 00:25:09 +0000 (+1000)
Subject: Merge remote-tracking branch 'net/master'
X-Git-Tag: next-20130527~100
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f31b023ef5543b9c5c0dca3651d5f6d3cc9e9e3c;p=karo-tx-linux.git

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

f31b023ef5543b9c5c0dca3651d5f6d3cc9e9e3c