From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Dec 2011 23:10:19 +0000 (+1100)
Subject: Merge remote-tracking branch 'net/master'
X-Git-Tag: next-20111206~95
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=159d60e3c8f3c67fa63768962b4dd04501a631b3;p=karo-tx-linux.git

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

159d60e3c8f3c67fa63768962b4dd04501a631b3