From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Dec 2011 23:49:36 +0000 (+1100)
Subject: Merge remote-tracking branch 'net/master'
X-Git-Tag: next-20111209~103
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=db4065e885ba828c29a86c4142111611154d3eff;p=karo-tx-linux.git

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

db4065e885ba828c29a86c4142111611154d3eff