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 ...
Showing
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment