diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-04 01:21:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-04 01:21:02 +0200 |
| commit | 316343e2cfd9a4bb4c70d0e1991e7a74840fe29e (patch) | |
| tree | 3608312dfc3c6af92c9abb79f0b8984d0473feee /drivers/net/macmace.c | |
| parent | Split up PIT part of TSC calibration from native_calibrate_tsc (diff) | |
| parent | Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jga... (diff) | |
| download | linux-316343e2cfd9a4bb4c70d0e1991e7a74840fe29e.tar.xz linux-316343e2cfd9a4bb4c70d0e1991e7a74840fe29e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
bnx2x: Accessing un-mapped page
ath9k: Fix TX control flag use for no ACK and RTS/CTS
ath9k: Fix TX status reporting
iwlwifi: fix STATUS_EXIT_PENDING is not set on pci_remove
iwlwifi: call apm stop on exit
iwlwifi: fix Tx cmd memory allocation failure handling
iwlwifi: fix rx_chain computation
iwlwifi: fix station mimo power save values
iwlwifi: remove false rxon if rx chain changes
iwlwifi: fix hidden ssid discovery in passive channels
iwlwifi: W/A for the TSF correction in IBSS
netxen: Remove workaround for chipset quirk
pcnet-cs, axnet_cs: add new IDs, remove dup ID with less info
ixgbe: initialize interrupt throttle rate
net/usb/pegasus: avoid hundreds of diagnostics
tipc: Don't use structure names which easily globally conflict.
Diffstat (limited to 'drivers/net/macmace.c')
0 files changed, 0 insertions, 0 deletions