]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Wed, 9 Nov 2011 21:22:15 +0000 (16:22 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Nov 2011 21:22:15 +0000 (16:22 -0500)
1  2 
drivers/net/wireless/ath/regd.c
net/mac80211/mlme.c

Simple merge
Simple merge