From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 11 Dec 2011 23:40:11 +0000 (+1100)
Subject: Merge remote-tracking branch 'wireless/master'
X-Git-Tag: next-20111212~95
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=001298ba17639ee7ff2f7ca0e2cb9070760d5dcc;p=karo-tx-linux.git

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

001298ba17639ee7ff2f7ca0e2cb9070760d5dcc