]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 4 Dec 2009 21:25:15 +0000 (13:25 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 4 Dec 2009 21:25:15 +0000 (13:25 -0800)
commit8f56874bd7e8bee73ed6a1cf80dcec2753616262
treeaebd15dea662ef5efd89402b8fd92fec540a98eb
parent47e1c323069bcef0acb8a2b48921688573f5ca63
parent159bcfeb9123c91f0dc885a42b6387a98192f896
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
MAINTAINERS
include/net/mac80211.h
net/mac80211/ieee80211_i.h
net/mac80211/rx.c
net/wireless/scan.c
net/wireless/wext-core.c