From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 22 Aug 2011 18:28:50 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b38d355eaa223e420d0c45ff7a3279ea811552c5;p=linux.git

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

Conflicts:
	drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
	drivers/staging/ath6kl/os/linux/ar6000_drv.c
---

b38d355eaa223e420d0c45ff7a3279ea811552c5