Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 12:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
98793265b4
linux/drivers/net/ethernet
History
Linus Torvalds 98793265b4 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: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
2012-01-08 13:21:22 -08:00
..
3com sweep the floors and convert some .get_drvinfo routines to strlcpy 2011-11-08 15:11:57 -05:00
8390 net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
adaptec net: make vlan ndo_vlan_rx_[add/kill]_vid return error value 2011-12-08 19:52:37 -05:00
adi
aeroflex net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
alteon
amd module_param: make bool parameters really bool (net & drivers/net) 2011-12-19 22:27:29 -05:00
apple
atheros Sweep away N/A fw_version dustbunnies from the .get_drvinfo routine of a number of drivers 2011-11-22 16:43:32 -05:00
broadcom cnic: Improve error recovery on bnx2x devices 2012-01-05 14:01:21 -05:00
brocade bna: fix sparse warnings/errors 2012-01-05 13:23:00 -05:00
cadence net/cadence: enable by default NET_ATMEL 2011-11-16 17:33:50 -05:00
calxeda xgmac: cleanups 2012-01-05 13:23:00 -05:00
chelsio Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-01-08 13:21:22 -08:00
cirrus
cisco net: make vlan ndo_vlan_rx_[add/kill]_vid return error value 2011-12-08 19:52:37 -05:00
davicom Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-12-02 13:49:21 -05:00
dec net: fix assignment of 0/1 to bool variables. 2011-12-19 22:27:29 -05:00
dlink module_param: make bool parameters really bool (net & drivers/net) 2011-12-19 22:27:29 -05:00
emulex be2net: query link status in be_open() 2011-12-30 17:19:22 -05:00
faraday
freescale net: make ethtool_ops const 2012-01-05 13:23:00 -05:00
fujitsu net: sweep-up some straglers in strlcpy conversion of .get_drvinfo routines 2011-11-16 17:38:55 -05:00
hp
i825xx sweep the floors and convert some .get_drvinfo routines to strlcpy 2011-11-08 15:11:57 -05:00
ibm net: make vlan ndo_vlan_rx_[add/kill]_vid return error value 2011-12-08 19:52:37 -05:00
icplus icplus: mdio_write(), remove unnecessary for loop 2011-12-01 12:54:46 -05:00
intel ixgbe: FCoE: Add support for ndo_get_fcoe_hbainfo() call 2012-01-05 13:12:04 -05:00
marvell skge: fix warning when CONFIG_PM is defined but not CONFIG_PM_SLEEP 2012-01-03 13:53:16 -05:00
mellanox mlx4_core: Elaborating limitation on VF port options 2012-01-03 12:49:16 -05:00
micrel net: make ethtool_ops const 2012-01-05 13:23:00 -05:00
microchip
myricom myri10ge: Fix typo of 'VMware' in comment. 2011-12-19 15:44:43 -05:00
natsemi Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 2012-01-06 18:28:12 -08:00
neterion net: make vlan ndo_vlan_rx_[add/kill]_vid return error value 2011-12-08 19:52:37 -05:00
nuvoton net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
nvidia forcedeath: Fix bql support for forcedeath 2011-12-02 12:39:12 -05:00
octeon
oki-semi Sweep away N/A fw_version dustbunnies from the .get_drvinfo routine of a number of drivers 2011-11-22 16:43:32 -05:00
packetengines
pasemi pasemi_mac: Fix building as module 2011-12-06 00:48:59 -05:00
qlogic net: make vlan ndo_vlan_rx_[add/kill]_vid return error value 2011-12-08 19:52:37 -05:00
racal
rdc r6040: place comments before code 2012-01-04 15:55:53 -05:00
realtek 8139cp: properly config rx mode after resuming 2012-01-03 12:47:50 -05:00
renesas net: make ethtool_ops const 2012-01-05 13:23:00 -05:00
seeq net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
sfc sfc: Remove now-unused filter function 2012-01-04 14:10:23 -05:00
sgi net: meth: Add set_rx_mode hook to fix ICMPv6 neighbor discovery 2011-12-27 13:17:34 -05:00
silan
sis Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-01-08 13:21:22 -08:00
smsc net/smsc911x: Check if PHY is in operational mode before software reset 2012-01-03 20:24:15 -05:00
stmicro net: make ethtool_ops const 2012-01-05 13:23:00 -05:00
sun sunhme/PCI: use list_for_each_entry() for bus->devices traversal 2011-12-19 16:13:36 -05:00
tehuti net: make vlan ndo_vlan_rx_[add/kill]_vid return error value 2011-12-08 19:52:37 -05:00
ti net/davinci: do not use all descriptors for tx packets 2012-01-03 13:50:49 -05:00
tile Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-12-23 17:13:56 -05:00
toshiba powerpc/ps3: Fix hcall lv1_net_stop_rx_dma 2011-12-08 14:05:54 +11:00
tundra net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
via module_param: make bool parameters really bool (net & drivers/net) 2011-12-19 22:27:29 -05:00
xilinx net: ethernet: xilinx: Don't use NO_IRQ in xilinx 2011-12-21 15:42:50 -05:00
xircom sweep the floors and convert some .get_drvinfo routines to strlcpy 2011-11-08 15:11:57 -05:00
xscale
dnet.c net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
dnet.h
ethoc.c net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
fealnx.c sweep the floors and convert some .get_drvinfo routines to strlcpy 2011-11-08 15:11:57 -05:00
jme.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-12-02 13:49:21 -05:00
jme.h jme: PHY configuration for compatible issue 2011-11-27 19:21:09 -05:00
Kconfig net: add calxeda xgmac ethernet driver 2011-11-29 01:15:24 -05:00
korina.c net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
lantiq_etop.c NET: MIPS: lantiq: fix etop compile error 2011-11-14 14:34:54 -05:00
Makefile net: add calxeda xgmac ethernet driver 2011-11-29 01:15:24 -05:00
mipsnet.c
netx-eth.c
s6gmac.c