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