Merge branch 'net80211-update' of git://leaf.dragonflybsd.org/~rpaulo/dragonfly into...
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 18 Mar 2010 21:18:36 +0000 (14:18 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 18 Mar 2010 21:18:36 +0000 (14:18 -0700)

Trivial merge