diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-03 17:33:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-03 17:33:32 -0700 |
| commit | 8861e98115f185d9946d92deaee6c3639ef8d414 (patch) | |
| tree | 5a7cfd9a080e93de8b3d9fff2ada19c9f2ae0744 /drivers/rapidio/rio-driver.c | |
| parent | 6e315544a61ac0fa21369e54e50a947ab899966e (diff) | |
| parent | c54772e751c0262073e85a7aa87f093fc0dd44f1 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
[PATCH] myri10ge - Fix spurious invokations of the watchdog reset handler
[PATCH] myri10ge - Write the firmware in 256-bytes chunks
[PATCH] Stop calling phy_stop_interrupts() twice
[PATCH] s2io driver bug fixes #2
[PATCH] s2io driver bug fixes #1
[PATCH] zd1211rw: Packet filter fix for managed (STA) mode
[PATCH] zd1211rw: Fixed endianess issue with length info tag detection
[PATCH] zd1211rw: Remove bogus assert
[PATCH] zd1211rw: Fix software encryption/decryption
[PATCH] zd1211rw: Pass more management frame types up to host
[PATCH] zd1211rw: Fixes radiotap header
Diffstat (limited to 'drivers/rapidio/rio-driver.c')
0 files changed, 0 insertions, 0 deletions