Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 23 Aug 2012 13:49:42 +0000 (09:49 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 23 Aug 2012 13:49:42 +0000 (09:49 -0400)
commita4881cc45a3fab4488e16c4934e149cfa620f1a9
tree653eaec2c015a52ba17b4e1b714251b9472925ec
parent6de3f7e911d27d6737c79b3f6b5069044ea408ec
parentaba4e6fff8de0c92e53f0e7ef077231e75f7d760
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next