linux/arch
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
..
alpha utimensat implementation 2007-05-08 11:15:18 -07:00
arm Add IRQF_IRQPOLL flag on arm 2007-05-08 11:15:22 -07:00
arm26 header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
avr32 header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
blackfin blackfin architecture 2007-05-07 12:12:58 -07:00
cris dma_declare_coherent_memory wrong allocation 2007-05-08 11:15:14 -07:00
frv header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
h8300 header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
i386 fbdev: ignore VESA modes if framebuffer is disabled 2007-05-08 11:15:26 -07:00
ia64 Add IRQF_IRQPOLL flag on IA64 2007-05-08 11:15:22 -07:00
m32r header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
m68k header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
m68knommu header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
mips 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
parisc Add IRQF_IRQPOLL flag on parisc 2007-05-08 11:15:22 -07:00
powerpc 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
ppc Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2007-05-08 11:50:19 -07:00
s390 no longer #include <asm/kdebug.h> 2007-05-08 11:15:20 -07:00
sh Add IRQF_IRQPOLL flag on sh 2007-05-08 11:15:22 -07:00
sh64 Simplify kallsyms_lookup() 2007-05-08 11:15:08 -07:00
sparc header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
sparc64 utimensat implementation 2007-05-08 11:15:18 -07:00
um uml: pcap devices should get MACs from command line 2007-05-08 11:15:20 -07:00
v850 header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
x86_64 x86, serial: convert legacy COM ports to platform devices 2007-05-08 11:15:23 -07:00
xtensa header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00