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)
1  2 
sys/conf/files
sys/conf/options
sys/config/GENERIC
sys/config/LINT

diff --cc sys/conf/files
Simple merge
Simple merge
Simple merge
diff --cc sys/config/LINT
Simple merge