]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Nov 2011 21:46:55 +0000 (16:46 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Nov 2011 21:46:55 +0000 (16:46 -0500)
commit02f1ce35bed3ceb56868ec534591e15ffdcef879
tree49b72078598abe3542fb606a3af10dcb7f2d4f3f
parent5eccdf5e06eb67779716ae26142402a1ae9b012c
parent82e5fc2a34fa9ffea38f00c4066b7e600a0ca5e6
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
net/mac80211/status.c
net/wireless/reg.c