Skip to content
Snippets Groups Projects
Commit 4bdb0fba authored by John W. Linville's avatar John W. Linville Committed by David S. Miller
Browse files

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: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13f09b95
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment