From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 8 Apr 2010 20:34:49 +0000 (-0400)
Subject: ath5k: fixup some merge damage for AR5211 IQ calibration
X-Git-Tag: v2.6.35-rc1~473^2~460^2^2~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ace5d5de6bbaff00d3b5dd7ea8f160b570fdb726;p=pandora-kernel.git

ath5k: fixup some merge damage for AR5211 IQ calibration

Resolution of a merge conflict upstream accidentally removed a hunk of
"ath5k: IQ calibration for AR5211 is slightly different", so restore it.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed