]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.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, 15 Feb 2013 18:59:53 +0000 (13:59 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 15 Feb 2013 18:59:53 +0000 (13:59 -0500)
1  2 
drivers/net/wireless/iwlegacy/common.c
drivers/net/wireless/iwlwifi/dvm/sta.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rtlwifi/base.c
drivers/net/wireless/rtlwifi/rc.c

Simple merge
Simple merge