From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 24 Jan 2008 18:08:01 +0000 (-0500)
Subject: rt61pci: fix-up merge damage
X-Git-Tag: v2.6.25-rc1~1089^2~172
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bdb0fba9e53dc263eb9601404d097dd99e60f83;p=pandora-kernel.git

rt61pci: fix-up merge damage

A subtle merge error was introduced after re-queueing a patch for 2.6.24
instead of 2.6.25...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed