Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 5 Sep 2012 18:48:15 +0000 (14:48 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 5 Sep 2012 18:48:15 +0000 (14:48 -0400)
commit785a7de9ee5ab1ff2ec9c6e58667bde1055f2f1b
tree8846881677b2a72de5229a7e83e65d97469a7cb2
parent518eefe1b6fe53b347ffdfbb15a9367efbfd1955
parent7ce8c7a3433c6d6f4adfec0611d250782f0b4b0c
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211