From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 01:42:19 +0000 (+1100)
Subject: Merge remote-tracking branch 'net/master'
X-Git-Tag: next-20111103~86
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b3c4858e314c02b86ca0e40799889564fb0aa897;p=karo-tx-linux.git

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

b3c4858e314c02b86ca0e40799889564fb0aa897