Merge branch 'master' of git://git.dragonflybsd.org/dragonfly into wlan_serialize
authorJohannes Hofmann <johannes.hofmann@gmx.de>
Tue, 5 Mar 2013 16:04:52 +0000 (17:04 +0100)
committerJohannes Hofmann <johannes.hofmann@gmx.de>
Tue, 5 Mar 2013 16:04:52 +0000 (17:04 +0100)
1  2 
sys/dev/netif/ath/ath/if_ath.c
sys/dev/netif/iwn/if_iwn.c

Simple merge
Simple merge