From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Sep 2012 00:43:36 +0000 (+1000)
Subject: Merge remote-tracking branch 'net/master'
X-Git-Tag: next-20120925~122
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=da32cac0875530ccd4e08e4382630bb2a089690f;p=karo-tx-linux.git

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

da32cac0875530ccd4e08e4382630bb2a089690f