android_kernel_motorola_sm6225/drivers/net/ethernet/stmicro/stmmac
Linus Torvalds 06991c28f3 Driver core patches for 3.9-rc1
Here is the big driver core merge for 3.9-rc1
 
 There are two major series here, both of which touch lots of drivers all
 over the kernel, and will cause you some merge conflicts:
   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.
   - remove CONFIG_EXPERIMENTAL
 
 If you need me to provide a merged tree to handle these resolutions,
 please let me know.
 
 Other than those patches, there's not much here, some minor fixes and
 updates.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iEYEABECAAYFAlEmV0cACgkQMUfUDdst+yncCQCfbmnQZju7kzWXk6PjdFuKspT9
 weAAoMCzcAtEzzc4LXuUxxG/sXBVBCjW
 =yWAQ
 -----END PGP SIGNATURE-----

Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core patches from Greg Kroah-Hartman:
 "Here is the big driver core merge for 3.9-rc1

  There are two major series here, both of which touch lots of drivers
  all over the kernel, and will cause you some merge conflicts:

   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.

   - remove CONFIG_EXPERIMENTAL

  Other than those patches, there's not much here, some minor fixes and
  updates"

Fix up trivial conflicts

* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
  base: memory: fix soft/hard_offline_page permissions
  drivercore: Fix ordering between deferred_probe and exiting initcalls
  backlight: fix class_find_device() arguments
  TTY: mark tty_get_device call with the proper const values
  driver-core: constify data for class_find_device()
  firmware: Ignore abort check when no user-helper is used
  firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
  firmware: Make user-mode helper optional
  firmware: Refactoring for splitting user-mode helper code
  Driver core: treat unregistered bus_types as having no devices
  watchdog: Convert to devm_ioremap_resource()
  thermal: Convert to devm_ioremap_resource()
  spi: Convert to devm_ioremap_resource()
  power: Convert to devm_ioremap_resource()
  mtd: Convert to devm_ioremap_resource()
  mmc: Convert to devm_ioremap_resource()
  mfd: Convert to devm_ioremap_resource()
  media: Convert to devm_ioremap_resource()
  iommu: Convert to devm_ioremap_resource()
  drm: Convert to devm_ioremap_resource()
  ...
2013-02-21 12:05:51 -08:00
..
chain_mode.c stmmac: add CHAINED descriptor mode support (V4) 2011-10-19 19:24:18 -04:00
common.h stmmac: add Rx watchdog support to mitigate the DMA irqs 2012-11-26 17:22:12 -05:00
descs.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00
descs_com.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00
dwmac100.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00
dwmac100_core.c stmmac: add the Energy Efficient Ethernet support 2012-07-01 03:34:50 -07:00
dwmac100_dma.c stmmac: add mixed burst for DMA 2012-05-14 18:53:19 -04:00
dwmac1000.h stmmac: add Rx watchdog support to mitigate the DMA irqs 2012-11-26 17:22:12 -05:00
dwmac1000_core.c stmmac: add the Energy Efficient Ethernet support 2012-07-01 03:34:50 -07:00
dwmac1000_dma.c stmmac: add Rx watchdog support to mitigate the DMA irqs 2012-11-26 17:22:12 -05:00
dwmac_dma.h stmmac: remove two repeated macros 2012-12-03 13:35:36 -05:00
dwmac_lib.c stmmac: add Rx watchdog support to mitigate the DMA irqs 2012-11-26 17:22:12 -05:00
enh_desc.c stmmac: sanitize the rx coe and add the type-1 csum (v2) 2012-04-04 18:39:23 -04:00
Kconfig drivers/net/ethernet/stmicro/stmmac: remove depends on CONFIG_EXPERIMENTAL 2013-01-22 12:01:34 -08:00
Makefile stmmac: remove dead code for STMMAC_TIMER support 2012-11-26 17:22:10 -05:00
mmc.h stmmac: add header inclusion protection 2012-08-24 13:25:05 -04:00
mmc_core.c stmmac: fix a typo in the macro used to mask the mmc irq 2012-08-22 19:14:31 -07:00
norm_desc.c stmmac: sanitize the rx coe and add the type-1 csum (v2) 2012-04-04 18:39:23 -04:00
ring_mode.c stmmac: Fix for higher mtu size handling 2012-07-09 14:37:52 -07:00
stmmac.h stmmac: fix platform driver unregistering 2012-12-14 13:14:07 -05:00
stmmac_ethtool.c ethtool: fix drvinfo strings set in drivers 2013-01-06 21:06:31 -08:00
stmmac_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net into net 2013-02-18 23:34:21 -05:00
stmmac_mdio.c stmmac: mdio register has to fail if the phy is not found 2013-02-10 20:12:10 -05:00
stmmac_pci.c stmmac: don't return zero on failure path in stmmac_pci_probe() 2013-02-03 16:14:09 -05:00
stmmac_platform.c drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00