From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 30 Nov 2011 19:14:42 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: next-20111201~96^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3b95e9c089d932c11f9ec03f7493f02cceff04ba;p=karo-tx-linux.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
---

3b95e9c089d932c11f9ec03f7493f02cceff04ba