]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 29 May 2014 16:55:38 +0000 (12:55 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 29 May 2014 16:55:38 +0000 (12:55 -0400)
commit47583d10575e110e4c6293790b1ebf7d3f9f6681
tree1b72ea0d454affab6d6cc743939cfb316fad14b3
parentc817cca3cdda73bdc73ab1980f509794eae7c535
parent9ca5019a5eb5538ce53e58b1cb35d04af97cc68a
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
net/mac80211/sta_info.c
net/mac80211/status.c
net/mac80211/trace.h