From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Oct 2008 17:08:08 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.28-rc1~605
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fffdedef691a0f6fa7ca1fc0a2a508cbb49def69;p=platform%2Fkernel%2Flinux-3.10.git

Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net/mac80211/rx.c: fix build error
  acpi: Make ACPI_TOSHIBA depend on INPUT.
  net/bfin_mac.c MDIO namespace fixes
  jme: remove unused #include <version.h>
  netfilter: remove unused #include <version.h>
  net: Fix off-by-one in skb_dma_map
  smc911x: Add support for LAN921{5,7,8} chips from SMSC
  qlge: remove duplicated #include
  wireless: remove duplicated #include
  net/au1000_eth.c MDIO namespace fixes
  net/tc35815.c: fix compilation
  sky2: Fix WOL regression
  r8169: NULL pointer dereference on r8169 load
---

fffdedef691a0f6fa7ca1fc0a2a508cbb49def69