]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 04850a4) | patch
rt2x00: fixup some non-functional merge errors
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 27 Mar 2008 23:54:13 +0000 (19:54 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 1 Apr 2008 21:13:17 +0000 (17:13 -0400)
commit3480a58a90cd505578b9979d878a5ad9c347d424
treeaf0d9f8103e1a782d78ef522272b838e2d4c92d3tree | snapshot
parent04850a47aa7d03cbf651a91262fdaa9f18373dfccommit | diff
rt2x00: fixup some non-functional merge errors

These small changes restore the rt2x00 sources to the way Ivo intended.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rt2x00/rt2x00.h diff | blob | history
drivers/net/wireless/rt2x00/rt2x00dev.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.