Linus Torvalds 9028780a3e 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: (40 commits) [netdrvr] atl1: fix build pasemi_mac: Use local-mac-address instead of mac-address if available pasemi_mac: PHY support pasemi_mac: Add msglevel support and "debug" module param pasemi_mac: Logic cleanup / rx performance improvements pasemi_mac: Minor cleanup / define fixes pasemi_mac: Add SKB reuse / copy-break pasemi_mac: Timer and interrupt fixes pasemi_mac: Abstract and fix up interrupt restart routines pasemi_mac: Move the IRQ mapping from the PCI layer to the driver tc35815: Remove unnecessary skb->dev assignment drivers/net/dm9000: Convert to generic boolean AT91RM9200 Ethernet: Fix multicast addressing AT91RM9200 Ethernet: Support additional PHYs PCMCIA-NETDEV : xirc2ps_cs: bugfix of multicast code sky2: re-enable 88E8056 for most motherboards MIPS: Drop unnecessary CONFIG_ISA from RBTX49XX ne: MIPS: Use platform_driver for ne on RBTX49XX ne: Add NEEDS_PORTLIST to control ISA auto-probe ne: Misc fixes for platform driver. ... Fix conflict in drivers/net/pasemi_mac.c (get_property() got renamed to of_get_property()) manually. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2007-05-08 11:57:17 -07:00
..
ehea_ethtool.c	ehea: removing unused functionality	2007-04-28 11:01:02 -04:00
ehea_hcall.h
ehea_hw.h
ehea_main.c	Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6	2007-05-08 11:57:17 -07:00
ehea_phyp.c	ehea: code cleanup	2007-04-28 11:01:01 -04:00
ehea_phyp.h	ehea: code cleanup	2007-04-28 11:01:01 -04:00
ehea_qmr.c	ehea: code cleanup	2007-04-28 11:01:01 -04:00
ehea_qmr.h	ehea: removing unused functionality	2007-04-28 11:01:02 -04:00
ehea.h	ehea: fix for dlpar support	2007-04-28 11:01:06 -04:00
Makefile