diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 16:02:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 16:02:05 -0700 |
| commit | 9ce3075c20d458040138690edfdf6446664ec3ee (patch) | |
| tree | 7431fd54ce8ea8ee9224a86fa5f4cc69226ea216 /net/unix | |
| parent | b3b7cc7b4138f4171da5813b5ec2a14835e02482 (diff) | |
| parent | 17cf8cc9439262cd90421435e0e8c7ab0af26833 (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: (35 commits)
Add support for the Davicom DM9161A PHY
sky2: only disable 88e8056 on some boards
sky2: 88e8071 support not ready
skge: crash on shutdown/suspend
sky2: fix oops on shutdown
mlx4: don't use deprecated IRQ flags
netxen_nic_main don't use deprecated irq flags
Use menuconfig objects II - netdev/wan
Use menuconfig objects II - netdev/pcmcia
Use menuconfig objects II - netdev/atm
Use menuconfig objects: netdev
Use menuconfig objects: PHY
spidernet: remove unnecessary accesses to phy
S2IO: Statistics for link up/down and memory allocated/freed
S2IO: statistics for memory allocation failuers
S2IO: getringparam ethtool option
[PATCH] libertas: 64-bit cleanups
[PATCH] libertas: sparse fixes
[PATCH] libertas: fix missing unlock in TX error path
[PATCH] libertas: make debugfs.c sparse-clean
...
Diffstat (limited to 'net/unix')
0 files changed, 0 insertions, 0 deletions