From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 22 Jul 2011 21:51:16 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.1-rc1~255^2~14^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41bf37117b47fc5ce2aae91f6a108e7e42e0b046;p=thirdparty%2Fkernel%2Flinux.git

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

41bf37117b47fc5ce2aae91f6a108e7e42e0b046