Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ed911fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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)
  bonding/bond_main.c: make 2 functions static
  ps3: gigabit ethernet driver for PS3, take3
  [netdrvr] Fix dependencies for ax88796 ne2k clone driver
  eHEA: Capability flag for DLPAR support
  Remove sk98lin ethernet driver.
  sunhme.c:quattro_pci_find() must be __devinit
  bonding / ipv6: no addrconf for slaves separately from master
  atl1: remove write-only var in tx handler
  macmace: use "unsigned long flags;"
  Cleanup usbnet_probe() return value handling
  netxen: deinline and sparse fix
  eeprom_93cx6: shorten pulse timing to match spec (bis)
  phylib: Add Marvell 88E1112 phy id
  phylib: cleanup marvell.c a bit
  AX88796 network driver
  IOC3: Switch to pci refcounting safe APIs
  e100: Fix Tyan motherboard e100 not receiving IPMI commands
  QE Ethernet driver writes to wrong register to mask interrupts
  rrunner.c:rr_init() must be __devinit
  tokenring/3c359.c:xl_init() must be __devinit
  ...
parents 64b853aa 4ad072c9

Documentation/feature-removal-schedule.txt

+0 −8
Original line number Diff line number Diff line
@@ -248,14 +248,6 @@ Who: Len Brown <len.brown@intel.com> 


---------------------------



What:   sk98lin network driver

When:   July 2007

Why:    In kernel tree version of driver is unmaintained. Sk98lin driver

	replaced by the skge driver. 

Who:    Stephen Hemminger <shemminger@osdl.org>



---------------------------



What:	Compaq touchscreen device emulation

When:	Oct 2007

Files:	drivers/input/tsdev.c

Documentation/networking/00-INDEX

+0 −3
Original line number Diff line number Diff line
@@ -96,9 +96,6 @@ routing.txt 
	- the new routing mechanism

shaper.txt

	- info on the module that can shape/limit transmitted traffic.

sk98lin.txt

	- Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit

	  Ethernet Adapter family driver info

skfp.txt

	- SysKonnect FDDI (SK-5xxx, Compaq Netelligent) driver info.

smc9.txt

Documentation/networking/sk98lin.txt

deleted100644 → 0
+0 −568

File deleted.

Preview size limit exceeded, changes collapsed.

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -2930,6 +2930,13 @@ M: mikpe@it.uu.se 
L:	linux-ide@vger.kernel.org

S:	Maintained



PS3 NETWORK SUPPORT

P:	Masakazu Mokuno

M:	mokuno@sm.sony.co.jp

L:	netdev@vger.kernel.org

L:	cbe-oss-dev@ozlabs.org

S:	Supported



PS3 PLATFORM SUPPORT

P:	Geoff Levand

M:	geoffrey.levand@am.sony.com

drivers/misc/eeprom_93cx6.c

+3 −3
Original line number Diff line number Diff line
@@ -55,10 +55,10 @@ static inline void eeprom_93cx6_pulse_low(struct eeprom_93cx6 *eeprom) 


	/*

	 * Add a short delay for the pulse to work.

	 * According to the specifications the minimal time

	 * should be 450ns so a 1us delay is sufficient.

	 * According to the specifications the "maximum minimum"

	 * time should be 450ns.

	 */

	udelay(1);

	ndelay(450);

}



static void eeprom_93cx6_startup(struct eeprom_93cx6 *eeprom)