linux-next/Documentation
Linus Torvalds 6ba74014c1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits)
  phy/marvell: add 88ec048 support
  igb: Program MDICNFG register prior to PHY init
  e1000e: correct MAC-PHY interconnect register offset for 82579
  hso: Add new product ID
  can: Add driver for esd CAN-USB/2 device
  l2tp: fix export of header file for userspace
  can-raw: Fix skb_orphan_try handling
  Revert "net: remove zap_completion_queue"
  net: cleanup inclusion
  phy/marvell: add 88e1121 interface mode support
  u32: negative offset fix
  net: Fix a typo from "dev" to "ndev"
  igb: Use irq_synchronize per vector when using MSI-X
  ixgbevf: fix null pointer dereference due to filter being set for VLAN 0
  e1000e: Fix irq_synchronize in MSI-X case
  e1000e: register pm_qos request on hardware activation
  ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice
  net: Add getsockopt support for TCP thin-streams
  cxgb4: update driver version
  cxgb4: add new PCI IDs
  ...

Manually fix up conflicts in:
 - drivers/net/e1000e/netdev.c: due to pm_qos registration
   infrastructure changes
 - drivers/net/phy/marvell.c: conflict between adding 88ec048 support
   and cleaning up the IDs
 - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req
   conflict (registration change vs marking it static)
2010-08-04 11:47:58 -07:00
..
2009-10-01 21:17:49 +02:00
2010-05-27 09:12:43 -07:00
2010-02-24 13:51:32 +01:00
2008-02-14 00:16:13 -05:00
2008-10-16 11:21:30 -07:00
2008-02-03 15:54:28 +02:00
2010-06-03 11:33:50 +02:00
2009-12-09 14:21:36 -08:00
2008-01-11 18:22:30 -06:00
2005-04-16 15:20:36 -07:00
2010-05-10 10:23:17 +02:00
2009-06-18 13:04:04 -07:00
2006-11-30 04:58:40 +01:00
2010-04-08 11:34:34 +02:00
2008-12-03 16:09:53 -07:00
2008-07-25 10:53:30 -07:00
2009-10-15 07:25:20 -06:00
2010-04-22 15:24:56 -07:00
2008-03-24 19:22:19 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2009-07-01 22:36:22 +02:00
2009-08-28 15:21:12 -04:00
2009-04-27 12:00:27 -07:00
2009-04-27 12:00:27 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2008-11-12 17:17:17 -08:00
2010-03-10 17:09:33 -05:00
2006-06-27 17:32:47 -07:00
2005-04-16 15:20:36 -07:00
2005-06-21 18:46:32 -07:00
2005-04-16 15:20:36 -07:00
2010-04-27 22:59:07 +02:00
2005-04-16 15:20:36 -07:00
2010-03-16 11:47:56 +01:00
2010-08-02 15:35:10 +10:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00