linux/drivers/net/ethernet
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
2011-11-06 19:44:47 -08:00
..
3com
8390
adaptec
adi
aeroflex
alteon
amd Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
apple net/ethernet: Move mac89x0.c from apple to cirrus 2011-11-01 19:30:38 -04:00
atheros
broadcom bnx2x: update driver version to 1.70.30-0 2011-10-27 16:14:17 -04:00
brocade drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
cadence Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-27 08:39:10 +02:00
chelsio drivers/net: fix mislocated headers in cxgb4/l2t.c 2011-10-31 19:31:10 -04:00
cirrus net/ethernet: Move mac89x0.c from apple to cirrus 2011-11-01 19:30:38 -04:00
cisco
davicom
dec
dlink
emulex Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
faraday
freescale drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
fujitsu
hp
i825xx drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug 2011-11-01 00:53:33 -04:00
ibm ehea: fix skb_frag_size typo 2011-10-25 16:20:43 +02:00
icplus
intel Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
marvell
mellanox Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
micrel
microchip
myricom
natsemi
neterion drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
nuvoton
nvidia
octeon drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
oki-semi drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
packetengines
pasemi
qlogic qlcnic: fix beacon and LED test. 2011-10-30 03:09:41 -04:00
racal
rdc
realtek net/ethernet: sc92031 is not Realtek 2011-11-01 19:30:38 -04:00
renesas
seeq
sfc drivers/net: Add moduleparam.h to drivers as required. 2011-10-31 19:31:09 -04:00
sgi
silan net/ethernet: sc92031 is not Realtek 2011-11-01 19:30:38 -04:00
sis
smsc drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
stmicro Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2011-11-06 18:54:53 -08:00
sun
tehuti
ti
tile
toshiba Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2011-11-06 17:12:03 -08:00
tundra
via
xilinx net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c 2011-11-02 01:49:44 -04:00
xircom
xscale drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
dnet.c
dnet.h
ethoc.c drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
fealnx.c
jme.c
jme.h
Kconfig net/ethernet: sc92031 is not Realtek 2011-11-01 19:30:38 -04:00
korina.c
lantiq_etop.c
Makefile net/ethernet: sc92031 is not Realtek 2011-11-01 19:30:38 -04:00
mipsnet.c
netx-eth.c
s6gmac.c