From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 2 Dec 2011 00:45:59 +0000 (+1100)
Subject: Merge remote-tracking branch 'net-next/master'
X-Git-Tag: next-20111202~50
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b20e9a21ebaccad27f6875cd3b646375bbe08741;p=karo-tx-linux.git

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

b20e9a21ebaccad27f6875cd3b646375bbe08741