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)
commit3b971a7ceb2e39e0cab95c079c738b2052b3e02f
tree511e1112b22220c0f866718bbfa8cbee386f9d27
parentb12f62efb8ec0b9523bdb6c2d412c07193086de9
parente29ec6247053ad60bd0b36f155b647364a615097
Merge branch 'for-davem' of git://git./linux/kernel/git/linville/wireless
drivers/net/wireless/ath/regd.c
net/mac80211/mlme.c