]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 14 Nov 2012 19:15:43 +0000 (14:15 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 14 Nov 2012 19:15:43 +0000 (14:15 -0500)
1  2 
net/mac80211/sta_info.c
net/mac80211/util.c

Simple merge
Simple merge