Merge branch 'net80211-update' of git://leaf.dragonflybsd.org/~rpaulo/dragonfly into...
authorMatthew Dillon <dillon@apollo.backplane.com>
Tue, 23 Mar 2010 16:30:52 +0000 (09:30 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Tue, 23 Mar 2010 16:30:52 +0000 (09:30 -0700)

Trivial merge