Bad merge from r3161; see r3123 for rationale
authormentor <mentor@0192ed92-7a03-0410-a25b-9323aeb14dbd>
Fri, 18 Jan 2008 17:26:28 +0000 (17:26 +0000)
committermentor <mentor@0192ed92-7a03-0410-a25b-9323aeb14dbd>
Fri, 18 Jan 2008 17:26:28 +0000 (17:26 +0000)
commit249e5b919bd6d268a76f350337327569840702c3
tree342d334653354cc30ec3f0707339faa00f69af50
parentac2124cce387b913ee7c9dc1669cc66f39186a1a
Bad merge from r3161; see r3123 for rationale

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3204 0192ed92-7a03-0410-a25b-9323aeb14dbd
net80211/ieee80211_power.c