From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 00:29:43 +0000 (+1000)
Subject: Merge remote-tracking branch 'net/master'
X-Git-Tag: next-20130619~121
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fdeca410e3ac1a555113e3079e25fca8656760a1;p=karo-tx-linux.git

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

fdeca410e3ac1a555113e3079e25fca8656760a1