linux/drivers/net/fs_enet
Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
Kconfig fs_enet: Add support for MPC512x to fs_enet driver 2010-02-27 02:34:35 -08:00
Makefile fs_enet: Remove !CONFIG_PPC_CPM_NEW_BINDING code 2008-07-16 17:57:49 -05:00
fec.h
fs_enet-main.c fs_enet: enable transmit time stamping. 2011-06-20 13:56:54 -07:00
fs_enet.h fs_enet: Add support for MPC512x to fs_enet driver 2010-02-27 02:34:35 -08:00
mac-fcc.c fs_enet: fix freescale FCC ethernet dp buffer alignment 2011-06-17 15:20:49 -04:00
mac-fec.c powerpc: Fix multicast problem in fs_enet driver 2011-04-21 16:59:30 -07:00
mac-scc.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
mii-bitbang.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
mii-fec.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00