]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9f03d65d6bd245409e8131d15b0d4e3c75561856
treef15102f503619bcbd266acf650ade8b7b17f1c04
parent599dd11e830ec4d5e570063a78a700d698ccd099
parent3b6b9c9692dd6667809421eefdc7773b48200948
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
net/mac80211/sta_info.c
net/mac80211/util.c