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

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

468ae3a37ffe5d867bca3a2b4bcff6087834b57e