]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 13f09b9) | patch
rt61pci: fix-up merge damage
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 24 Jan 2008 18:08:01 +0000 (13:08 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 Feb 2008 03:26:33 +0000 (19:26 -0800)
commit4bdb0fba9e53dc263eb9601404d097dd99e60f83
treefcffdab76710a231579fd927203cb0f50ced7657tree | snapshot
parent13f09b95a82c46ed608d057b22e0dd18ebfff22acommit | diff
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>
drivers/net/wireless/rt2x00/rt61pci.c diff | blob | history
Linux 2.6 source tree