]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 9 Aug 2013 19:08:10 +0000 (15:08 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 9 Aug 2013 19:08:10 +0000 (15:08 -0400)
1  2 
net/mac80211/cfg.c
net/wireless/nl80211.c

Simple merge
Simple merge