Cleanup merge wierdness
authormtaylor <mtaylor@0192ed92-7a03-0410-a25b-9323aeb14dbd>
Wed, 16 Jan 2008 01:08:28 +0000 (01:08 +0000)
committermtaylor <mtaylor@0192ed92-7a03-0410-a25b-9323aeb14dbd>
Wed, 16 Jan 2008 01:08:28 +0000 (01:08 +0000)
commit934d2aea426752dca60b3524a54d2580c09c24dc
tree92909943b3220f169f8e79675fc2de539a082bad
parentec46fcf728f090897910f367eba78b05380788f6
Cleanup merge wierdness

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3153 0192ed92-7a03-0410-a25b-9323aeb14dbd
ath/if_ath.c