Merge branch 'net80211-update' of git://leaf.dragonflybsd.org/~rpaulo/dragonfly into...
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 12 Apr 2010 16:45:53 +0000 (09:45 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 12 Apr 2010 16:45:53 +0000 (09:45 -0700)

Trivial merge