From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 30 Nov 2011 00:01:29 +0000 (+1100)
Subject: Merge remote-tracking branch 'net/master'
X-Git-Tag: next-20111130~96
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1747a784171227c96feacb7d4b8925d01b5666ff;p=karo-tx-linux.git

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

1747a784171227c96feacb7d4b8925d01b5666ff