diff options
| author | 2007-03-15 15:31:37 -0700 | |
|---|---|---|
| committer | 2007-03-15 15:31:37 -0700 | |
| commit | b810cdfcf91d76f603fd48023aede48ced8e6bed (patch) | |
| tree | 6b2dd0608c0241f29ac1e84fa7b629a1a0f5ceb9 /kernel/exec_domain.c | |
| parent | [PATCH] sysfs: reinstate exclusion between method calls and attribute unregistration (diff) | |
| parent | natsemi: Avoid IntrStatus lossage if RX state machine resets. (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:
natsemi: Avoid IntrStatus lossage if RX state machine resets.
natsemi: Fix NAPI for interrupt sharing
natsemi: Consistently use interrupt enable/disable functions
NetXen: Fix softlockup seen during hardware access
NetXen: Bug fix for Jumbo frames on XG card
skge: set mac address bonding fix
Diffstat (limited to 'kernel/exec_domain.c')
0 files changed, 0 insertions, 0 deletions
