kevin/linux
1
Fork 0
Code
e89b064a4f
linux/arch/mips
History
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
..
arc [MIPS] ARC: Fix several compiler warnings. 2007-03-08 01:10:30 +00:00
au1000 [MIPS] MTX1: add idsel cardbus ressources 2007-03-04 19:02:44 +00:00
basler/excite [MIPS] Use DEFINE_SPINLOCK instead of SPIN_LOCK_UNLOCKED. 2007-04-27 16:20:25 +01:00
boot
cobalt Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2007-05-01 00:24:54 -04:00
configs MIPS: Drop unnecessary CONFIG_ISA from RBTX49XX 2007-05-08 01:23:09 -04:00
ddb5xxx [MIPS] Misc fixes for plat_irq_dispatch functions 2007-03-19 20:22:43 +00:00
dec [MIPS] DEC: Remove call to register_prom_console. 2007-03-09 12:14:52 +00:00
emma2rh [MIPS] Misc fixes for plat_irq_dispatch functions 2007-03-19 20:22:43 +00:00
gt64120 [MIPS] merge GT64111 PCI routines and GT64120 PCI_0 routines 2007-04-27 16:20:23 +01:00
jazz [MIPS] Jazz: Fix warning. 2007-03-24 17:01:50 +00:00
jmr3927 [MIPS] JMR3927 cleanup 2007-04-27 16:20:23 +01:00
kernel header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
lasat [MIPS] Fix and cleanup the mess that a dozen prom_printf variants are. 2007-03-04 19:02:37 +00:00
lib PCI: Cleanup the includes of <linux/pci.h> 2007-05-02 19:02:35 -07:00
lib-32 [MIPS] Kill redundant EXTRA_AFLAGS 2007-02-26 23:06:05 +00:00
lib-64 [MIPS] Kill redundant EXTRA_AFLAGS 2007-02-26 23:06:05 +00:00
math-emu header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
mips-boards MIPSnet: Modernize use platform_device API. 2007-04-28 11:01:01 -04:00
mm header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
momentum [MIPS] Misc fixes for plat_irq_dispatch functions 2007-03-19 20:22:43 +00:00
oprofile [MIPS] Fix oprofile logic to physical counter remapping 2007-04-24 22:10:18 +01:00
pci [MIPS] Register PCI host bridge resource earlier 2007-04-27 16:20:25 +01:00
philips/pnx8550 [MIPS] Misc fixes for plat_irq_dispatch functions 2007-03-19 20:22:43 +00:00
pmc-sierra serial driver PMC MSP71xx 2007-05-07 12:12:50 -07:00
qemu [MIPS] Qemu: Fix Symmetric Uniprocessor support. 2007-03-19 20:22:43 +00:00
sgi-ip22 [MIPS] IP22: Get rid of volatile in IP22 core code. 2007-04-27 16:20:23 +01:00
sgi-ip27 header cleaning: don't include smp_lock.h when not used 2007-05-08 11:15:07 -07:00
sgi-ip32 [MIPS] Misc fixes for plat_irq_dispatch functions 2007-03-19 20:22:43 +00:00
sibyte [MIPS] Add bcm1480 ZBus trace support, fix wait related bugs 2007-04-27 16:20:25 +01:00
sni Replace deprecated SA_xxx interrupt flags 2007-05-08 11:15:08 -07:00
tx4927 ne: MIPS: Use platform_driver for ne on RBTX49XX 2007-05-08 01:23:09 -04:00
tx4938 ne: MIPS: Use platform_driver for ne on RBTX49XX 2007-05-08 01:23:09 -04:00
vr41xx [MIPS] update vr41xx Kconfig 2007-04-27 16:20:26 +01:00
defconfig [MIPS] Viper2: Remove defective support. 2007-03-13 16:59:31 +00:00
Kconfig MIPS: Drop unnecessary CONFIG_ISA from RBTX49XX 2007-05-08 01:23:09 -04:00
Kconfig.debug [MIPS] Make SMTC_IDLE_HOOK_DEBUG a proper option in Kconfig.debug. 2007-02-26 23:06:06 +00:00
Makefile [MIPS] Add bcm1480 ZBus trace support, fix wait related bugs 2007-04-27 16:20:25 +01:00