alistair23-linux/drivers/net/phy
Linus Torvalds 45c091bb2d Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits)
  [POWERPC] re-enable OProfile for iSeries, using timer interrupt
  [POWERPC] support ibm,extended-*-frequency properties
  [POWERPC] Extra sanity check in EEH code
  [POWERPC] Dont look for class-code in pci children
  [POWERPC] Fix mdelay badness on shared processor partitions
  [POWERPC] disable floating point exceptions for init
  [POWERPC] Unify ppc syscall tables
  [POWERPC] mpic: add support for serial mode interrupts
  [POWERPC] pseries: Print PCI slot location code on failure
  [POWERPC] spufs: one more fix for 64k pages
  [POWERPC] spufs: fail spu_create with invalid flags
  [POWERPC] spufs: clear class2 interrupt status before wakeup
  [POWERPC] spufs: fix Makefile for "make clean"
  [POWERPC] spufs: remove stop_code from struct spu
  [POWERPC] spufs: fix spu irq affinity setting
  [POWERPC] spufs: further abstract priv1 register access
  [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
  [POWERPC] spufs: dont try to access SPE channel 1 count
  [POWERPC] spufs: use kzalloc in create_spu
  [POWERPC] spufs: fix initial state of wbox file
  ...

Manually resolved conflicts in:
	drivers/net/phy/Makefile
	include/asm-powerpc/spu.h
2006-06-22 22:11:30 -07:00
..
cicada.c Remove linux/version.h include from drivers/net/phy/* and net/ieee80211/*. 2005-11-05 23:39:54 -05:00
davicom.c Remove linux/version.h include from drivers/net/phy/* and net/ieee80211/*. 2005-11-05 23:39:54 -05:00
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
lxt.c Remove linux/version.h include from drivers/net/phy/* and net/ieee80211/*. 2005-11-05 23:39:54 -05:00
Makefile Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
marvell.c Remove linux/version.h include from drivers/net/phy/* and net/ieee80211/*. 2005-11-05 23:39:54 -05:00
mdio_bus.c phy: mdiobus_register(): initialize all phy_map entries 2006-05-10 14:03:57 -07:00
phy.c Massive net driver const-ification. 2006-03-03 21:33:57 -05:00
phy_device.c [PATCH] missing license for libphy.ko 2005-12-24 10:05:51 -05:00
qsemi.c Remove linux/version.h include from drivers/net/phy/* and net/ieee80211/*. 2005-11-05 23:39:54 -05:00
smsc.c [PATCH] phy: new SMSC LAN83C185 PHY driver 2006-05-24 02:51:33 -04:00
vitesse.c [POWERPC] Add Vitesse 8244 PHY for MPC8641 HPCN platform. 2006-06-21 15:01:29 +10:00