Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Jan 2013 19:22:45 +0000 (14:22 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Jan 2013 19:22:45 +0000 (14:22 -0500)
commit79afb22d093993ef50f250f5368b565d0a0b7569
treef214793b3cb57b59ca777bd6de8b14e1b66573fe
parente7f767a7d9f809c494bfffffeda2bbdbfec110b4
parent2d31986764926630a6df72123a5e217219b32594
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next