From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Dec 2011 23:49:39 +0000 (+1100)
Subject: Merge remote-tracking branch 'wireless/master'
X-Git-Tag: next-20111209~100
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9587a76bdee5047eb1a3f6a0dca803c8b0ec29f2;p=karo-tx-linux.git

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

9587a76bdee5047eb1a3f6a0dca803c8b0ec29f2