Merge branch 'master' into net80211-update
authorRui Paulo <rpaulo@FreeBSD.org>
Mon, 29 Mar 2010 13:07:18 +0000 (14:07 +0100)
committerRui Paulo <rpaulo@FreeBSD.org>
Mon, 29 Mar 2010 13:07:18 +0000 (14:07 +0100)
commit1b2c87ca31619b40819b35bc5430c95daea509a2
tree17d67f644531c1fbbca481d51280b826dd1c741a
parent0f0332d15a22e2caecd871bf053b30bcfa7b08b2
parent448138f695b7a58b0695703beb380b2f4b300916
Merge branch 'master' into net80211-update

Conflicts:
sys/conf/options
sys/conf/files
sys/conf/options
sys/sys/mount.h