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)
commitbd2a81307487eba486f200423330d2403d0b893b
treef15102f503619bcbd266acf650ade8b7b17f1c04
parent6fe7cc71bbf3a0bc28c9cec3c00bc11e81344412
parent43c771a1963ab461a2f194e3c97fded1d5fe262f
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211
net/mac80211/sta_info.c
net/mac80211/util.c