From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 May 2014 23:30:05 +0000 (+1000)
Subject: Merge remote-tracking branch 'net/master'
X-Git-Tag: next-20140530~128
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b240be4e77527a974a3a280abdb901284e0a842c;p=karo-tx-linux.git

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

b240be4e77527a974a3a280abdb901284e0a842c