linux.git/drivers/net/Kconfig, branch v2.6.27

Blackfin EMAC Driver: the BF526 also supports the MAC,

2008-08-27T09:14:14+00:00

so update things accordingly

Signed-off-by: Mike Frysinger 
Signed-off-by: Bryan Wu 
Signed-off-by: Jeff Garzik

[netdrvr] ne: Use CONFIG_MACH_TX49XX

2008-08-14T08:44:11+00:00

After some cleanups in arch/mips area, now MACH_TX49XX is selected for
both TOSHIBA_RBTX4927 and TOSHIBA_RBTX4938.  Fold these two conditions
to one.

Signed-off-by: Atsushi Nemoto 
Signed-off-by: Jeff Garzik

[netdrvr] sh_eth: Add SH7619 support

2008-08-07T06:20:57+00:00

Add support SH7619 Internal ethernet controler.

Signed-off-by: Yoshinori Sato 
Signed-off-by: Jeff Garzik

sh_eth: Add support of SH7763 to sh_eth

2008-07-30T21:21:53+00:00

SH7763 has Ethernet core same as SH7710/SH7712.
Positions of some registry are different, but the basic part is the same.
I add support of ethernet of sh7763 to sh_eth.

Signed-off-by: Nobuhiro Iwamatsu 
Signed-off-by: Jeff Garzik

e1000: delete non NAPI code from the driver

2008-07-22T23:39:11+00:00

Compile-tested only.

Signed-off-by: Francois Romieu 
Signed-off-by: Jeff Kirsher 
Signed-off-by: Jeff Garzik

atl1e: Atheros L1E Gigabit Ethernet driver

2008-07-22T23:31:04+00:00

Full patch for the Atheros L1E Gigabit Ethernet driver.
Supportring AR8121, AR8113 and AR8114

Signed-off-by: Jie Yang 
Signed-off-by: Jeff Garzik

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

2008-07-21T00:43:29+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (1232 commits)
  iucv: Fix bad merging.
  net_sched: Add size table for qdiscs
  net_sched: Add accessor function for packet length for qdiscs
  net_sched: Add qdisc_enqueue wrapper
  highmem: Export totalhigh_pages.
  ipv6 mcast: Omit redundant address family checks in ip6_mc_source().
  net: Use standard structures for generic socket address structures.
  ipv6 netns: Make several "global" sysctl variables namespace aware.
  netns: Use net_eq() to compare net-namespaces for optimization.
  ipv6: remove unused macros from net/ipv6.h
  ipv6: remove unused parameter from ip6_ra_control
  tcp: fix kernel panic with listening_get_next
  tcp: Remove redundant checks when setting eff_sacks
  tcp: options clean up
  tcp: Fix MD5 signatures for non-linear skbs
  sctp: Update sctp global memory limit allocations.
  sctp: remove unnecessary byteshifting, calculate directly in big-endian
  sctp: Allow only 1 listening socket with SO_REUSEADDR
  sctp: Do not leak memory on multiple listen() calls
  sctp: Support ipv6only AF_INET6 sockets.
  ...

m68k/Apollo: remove the unused APOLLO_ELPLUS option

2008-07-21T00:24:40+00:00

Looking at older kernel sources the APOLLO_ELPLUS option was added
somewhere during kernel 2.1, but even kernel 2.2.0 does not contain
any driver that would be enabled through it...

Reported-by: Robert P. J. Day 
Signed-off-by: Adrian Bunk 
Signed-off-by: Geert Uytterhoeven 
Signed-off-by: Linus Torvalds

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-07-18T09:39:39+00:00

Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c

Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build

2008-07-15T05:44:51+00:00

Manual fixup of:

	arch/powerpc/Kconfig