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

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

22db16c88c85d7f11967514110b5bdfb0948dbf8