diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 17:56:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 17:56:58 +0200 |
| commit | 95f3eff6997ae4a6754c1d874ec0a414d97c44d1 (patch) | |
| tree | 0aba758649b4f56264cbe9736f6db18a98b9cc1f /drivers/usb/input/hid-ff.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sha... (diff) | |
| parent | [netdrvr] hp100: encapsulate all non-module code (diff) | |
| download | linux-95f3eff6997ae4a6754c1d874ec0a414d97c44d1.tar.xz linux-95f3eff6997ae4a6754c1d874ec0a414d97c44d1.zip | |
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: (37 commits)
[netdrvr] hp100: encapsulate all non-module code
drivers/net/wireless/{airo,ipw2100}: fix error handling bugs
[netdrvr] phy: Fix bugs in error handling
[PATCH] spidernet: Use pci_dma_mapping_error()
[PATCH] sky2: version 1.9
[PATCH] sky2: fragmented receive for large MTU
[PATCH] sky2: use netif_tx_lock instead of LLTX
[PATCH] sky2: incremental transmit completion
[PATCH] sky2: name irq after eth for irqbalance
[PATCH] sky2: workarounds for some 88e806x chips
[PATCH] sky2: use standard pci register capabilties for error register
[PATCH] sky2: gigabit full duplex negotiation
e100, e1000, ixgb: increment version numbers
ixgb: convert to netdev_priv(netdev)
ixgb: combine more rx descriptors to improve performance
e1000: possible memory leak in e1000_set_ringparam
e1000: Janitor: Use #defined values for literals
e1000: don't strip vlan ID if 8021q claims it
e1000: rework polarity, NVM, eeprom code and fixes.
e1000: driver state fixes (race fix)
...
Diffstat (limited to 'drivers/usb/input/hid-ff.c')
0 files changed, 0 insertions, 0 deletions