From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 20 Dec 2011 23:00:47 +0000 (+1100)
Subject: Merge remote-tracking branch 'wireless/master'
X-Git-Tag: next-20111221~103
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3bdb32e6be1f86e04b35fe56061235b0285ca733;p=karo-tx-linux.git

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

3bdb32e6be1f86e04b35fe56061235b0285ca733