From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 21 Jan 2008 18:41:18 +0000 (-0500)
Subject: wireless: cleanup some merge errors
X-Git-Tag: v2.6.25-rc1~1162^2~220
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0ddd04d55e0a4d1506b6b8a4eb9e2b62f3aa41d;p=pandora-kernel.git

wireless: cleanup some merge errors

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

Reading git-diff-tree failed