From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Oct 2011 00:22:36 +0000 (+1100)
Subject: Merge remote-tracking branch 'net/master'
X-Git-Tag: next-20111012~111
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=df2c4297ac47023941c0a984a2ad550a3e7321f0;p=karo-tx-linux.git

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

df2c4297ac47023941c0a984a2ad550a3e7321f0