git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
13f09b9
)
rt61pci: fix-up merge damage
author
John W. Linville
<linville@tuxdriver.com>
Thu, 24 Jan 2008 18:08:01 +0000
(13:08 -0500)
committer
David S. Miller
<davem@davemloft.net>
Fri, 1 Feb 2008 03:26:33 +0000
(19:26 -0800)
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>
No differences found