Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Mon, 25 May 2009 07:38:24 +0000 (00:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 May 2009 07:38:24 +0000 (00:38 -0700)
commit45ea4ea2af358fe316c918381c7868f9418cad09
tree4deb3d87b26e884b06929fe33740d45e78fbdcab
parentdddc045e2fdd4eb8d7dfac29bff191d639fff8c3
parenta2e2322d83df82a57ba456cfa604c8b8f7b04670
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6
net/wireless/nl80211.c