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
..
2005-04-16 15:20:36 -07:00
2006-09-28 16:56:43 +02:00
2007-02-21 10:55:59 +01:00
2005-09-07 16:57:21 -07:00
2006-09-28 16:56:43 +02:00
2007-04-27 16:01:42 +02:00
2007-03-05 23:35:50 +01:00
2006-09-28 16:56:43 +02:00
2007-02-05 21:18:17 +01:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2006-09-28 16:55:39 +02:00
2007-05-07 12:12:51 -07:00
2006-09-20 15:58:51 +02:00
2006-09-28 16:56:43 +02:00
2005-04-16 15:20:36 -07:00
2007-02-05 21:18:19 +01:00
2005-04-16 15:20:36 -07:00
2007-02-05 21:18:19 +01:00
2007-02-12 15:49:57 +01:00
2006-01-10 08:01:34 -08:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2007-04-27 16:01:44 +02:00
2006-10-06 16:38:35 +02:00
2006-09-28 16:56:43 +02:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2006-02-15 15:32:22 -08:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2006-12-08 15:56:07 +01:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2007-02-05 21:18:17 +01:00
2007-01-11 18:18:22 -08:00
2007-02-05 21:18:17 +01:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2006-09-28 16:56:43 +02:00
2006-10-06 16:38:35 +02:00
2006-01-14 18:27:10 -08:00
2005-04-16 15:20:36 -07:00
2007-04-27 16:01:44 +02:00
2005-04-16 15:20:36 -07:00
2006-09-28 16:56:43 +02:00
2005-04-16 15:20:36 -07:00
2007-04-27 16:01:44 +02:00
2006-09-28 16:56:43 +02:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-05-01 08:59:08 -07:00
2006-09-28 16:56:43 +02:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2006-09-28 16:56:43 +02:00
2005-04-16 15:20:36 -07:00
2007-02-05 21:18:17 +01:00
2005-04-16 15:20:36 -07:00
2007-02-05 21:18:17 +01:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2007-02-05 21:18:17 +01:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2007-03-19 13:19:07 +01:00
2005-06-04 17:13:00 -07:00
2005-04-16 15:20:36 -07:00