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
..
2007-05-08 02:32:17 -04:00
2007-05-08 11:15:23 -07:00
2007-04-28 11:01:06 -04:00
2007-02-09 09:14:07 -08:00
2006-09-13 13:24:59 -04:00
2006-09-13 13:24:59 -04:00
2006-09-13 13:24:59 -04:00
2006-09-13 13:24:59 -04:00
2006-09-13 13:24:59 -04:00
2006-09-13 13:24:59 -04:00
2007-02-09 09:14:07 -08:00
2007-02-06 19:03:56 -05:00
2006-09-13 13:24:59 -04:00
2007-05-03 13:21:48 -07:00
2007-05-03 13:21:13 -07:00
2007-05-03 17:23:35 -07:00
2007-05-03 13:25:32 -07:00
2006-09-13 13:24:59 -04:00
2007-02-09 16:23:17 +00:00
2006-09-13 13:24:59 -04:00
2006-09-13 13:24:59 -04:00
2006-09-13 13:24:59 -04:00
2006-09-13 13:24:59 -04:00
2007-02-09 09:14:07 -08:00
2006-09-13 13:24:59 -04:00
2007-02-09 09:14:07 -08:00
2006-09-13 13:24:59 -04:00
2006-09-13 13:24:59 -04:00
2006-12-09 09:41:18 -08:00
2006-12-02 00:11:56 -05:00
2007-03-29 11:46:52 -07:00
2007-05-04 17:59:08 -07:00
2007-05-08 01:48:19 -04:00
2007-05-04 17:59:06 -07:00
2007-05-04 17:59:07 -07:00
2007-02-07 18:50:53 -05:00
2007-05-04 17:59:07 -07:00
2007-05-04 17:59:08 -07:00
2007-04-28 11:01:04 -04:00
2007-04-28 11:01:05 -04:00
2006-12-04 02:00:34 -05:00
2006-12-02 21:22:37 -08:00
2006-09-13 13:24:59 -04:00
2006-09-13 13:24:59 -04:00
2007-05-08 01:48:19 -04:00
2007-04-28 11:00:58 -04:00
2007-04-25 22:24:41 -07:00
2007-04-28 11:01:01 -04:00
2007-04-28 11:01:03 -04:00
2007-04-28 11:01:01 -04:00
2007-04-28 11:01:07 -04:00
2006-09-13 13:24:59 -04:00
2006-09-13 13:24:59 -04:00
2007-04-28 11:01:00 -04:00
2006-09-13 13:24:59 -04:00
2007-04-25 22:24:41 -07:00
2006-09-13 13:24:59 -04:00
2007-05-08 01:15:35 -04:00
2007-02-09 09:14:07 -08:00
2007-02-09 09:14:07 -08:00
2007-05-04 17:59:08 -07:00
2007-05-04 17:59:07 -07:00
2007-02-05 16:58:43 -05:00
2007-02-27 04:16:03 -05:00
2007-05-07 00:26:30 -07:00
2007-05-07 00:25:49 -07:00
2006-11-22 14:57:56 +00:00
2007-04-26 01:00:55 -07:00
2007-02-09 09:14:07 -08:00
2006-12-02 00:11:56 -05:00