From: Thierry Reding <treding@nvidia.com>
Date: Fri, 25 Oct 2013 09:19:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'wireless/master'
X-Git-Tag: next-20131025~112
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1356f2f2ba1ce17e9cb031e9b857b22049e4a761;p=karo-tx-linux.git

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

1356f2f2ba1ce17e9cb031e9b857b22049e4a761