Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Browse source

* 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

...

This commit is contained in:

Linus Torvalds 2008-10-13 10:08:08 -07:00

parent 5723ff931a bf94e17bc8

commit fffdedef69

15 changed files with 55 additions and 56 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/acpi/Kconfig

View file

27

drivers/net/au1000_eth.c

View file

26

drivers/net/bfin_mac.c

View file

1

drivers/net/jme.c

View file

1

drivers/net/qlge/qlge_ethtool.c

View file

1

drivers/net/qlge/qlge_main.c

View file

3

drivers/net/r8169.c

View file

19

drivers/net/sky2.c

View file

6

drivers/net/smc911x.c

View file

14

drivers/net/smc911x.h

View file

2

drivers/net/tc35815.c

View file