git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2071a00)
iwlwifi: fix iwl1000 "RTS/CTS for HT" merge damage
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 11 Nov 2009 21:04:42 +0000 (13:04 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Nov 2009 21:04:42 +0000 (13:04 -0800)
I may have botched my merge conflict resolution instructions for Dave...

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

No differences found
Pandora Kernel Repository