Merge branch 'master' into net80211-update
authorRui Paulo <rpaulo@FreeBSD.org>
Wed, 7 Apr 2010 18:29:39 +0000 (19:29 +0100)
committerRui Paulo <rpaulo@FreeBSD.org>
Wed, 7 Apr 2010 18:29:39 +0000 (19:29 +0100)
commita81274c580e746e761a12cf026851ed8f729c0ff
tree5d1d7e901ccbd8f6cba9bb8fca6f56fe37762199
parent63a787e00d8ca5bbb38fcb014d62293b9ba6b482
parent975523fa1d5f20d7df3832f3d6b8adee58eec084
Merge branch 'master' into net80211-update
sys/conf/files
sys/conf/options
sys/config/GENERIC
sys/config/LINT