Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Thu, 28 Jul 2011 05:18:47 +0000 (22:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 28 Jul 2011 05:18:47 +0000 (22:18 -0700)
commitb49179c071b89423e1f6c50f6fa3d48d8158bc35
treeb6aca473839c2c9d7b72bafffa91e6dd6471f9a3
parent17dd759c67f21e34f2156abcf415e1f60605a188
parente5036c2575b244851637a81efc4104c076c4fa21
Merge branch 'for-davem' of git://git./linux/kernel/git/linville/wireless-next-2.6
drivers/net/wireless/b43/main.c