]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b38f31 82464e6)
Merge branch 'upstream-fixes' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 22 May 2006 18:45:29 +0000 (14:45 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 22 May 2006 18:45:29 +0000 (14:45 -0400)
1  2 
drivers/net/wireless/orinoco.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/orinoco.c
Simple merge
Linux 2.6 source tree