2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 20:53:53 +08:00
linux-next/arch/powerpc/platforms/pasemi
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
..
cpufreq.c [POWERPC] pasemi: Update ppc_proc_freq from cpufreq driver 2007-05-07 20:31:14 +10:00
gpio_mdio.c [POWERPC] get_property cleanups 2007-04-30 11:02:05 +10:00
idle.c [POWERPC] pasemi: Cpufreq driver 2007-04-27 15:51:57 +10:00
iommu.c [POWERPC] Rename get_property to of_get_property: arch/powerpc 2007-04-13 03:55:19 +10:00
Kconfig [POWERPC] pasemi: Kconfig for gpio_mdio 2007-04-27 15:51:56 +10:00
Makefile [POWERPC] pasemi: Cpufreq driver 2007-04-27 15:51:57 +10:00
pasemi.h [POWERPC] pasemi: Cpufreq driver 2007-04-27 15:51:57 +10:00
pci.c pasemi_mac: Move the IRQ mapping from the PCI layer to the driver 2007-05-08 01:47:53 -04:00
powersave.S [POWERPC] pasemi: Idle loops 2007-02-07 14:03:22 +11:00
setup.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
time.c Remove all inclusions of <linux/config.h> 2006-10-04 03:38:54 -04:00