Linus Torvalds f0094b28f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Pull networking fixes from David Miller: "Several networking final fixes and tidies for the merge window: 1) Changes during the merge window unintentionally took away the ability to build bluetooth modular, fix from Geert Uytterhoeven. 2) Several phy_node reference count bug fixes from Uwe Kleine-König. 3) Fix ucc_geth build failures, also from Uwe Kleine-König. 4) Fix klog false positivies when netlink messages go to network taps, by properly resetting the network header. Fix from Daniel Borkmann. 5) Sizing estimate of VF netlink messages is too small, from Jiri Benc. 6) New APM X-Gene SoC ethernet driver, from Iyappan Subramanian. 7) VLAN untagging is erroneously dependent upon whether the VLAN module is loaded or not, but there are generic dependencies that matter wrt what can be expected as the SKB enters the stack. Make the basic untagging generic code, and do it unconditionally. From Vlad Yasevich. 8) xen-netfront only has so many slots in it's transmit queue so linearize packets that have too many frags. From Zoltan Kiss. 9) Fix suspend/resume PHY handling in bcmgenet driver, from Florian Fainelli" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (55 commits) net: bcmgenet: correctly resume adapter from Wake-on-LAN net: bcmgenet: update UMAC_CMD only when link is detected net: bcmgenet: correctly suspend and resume PHY device net: bcmgenet: request and enable main clock earlier net: ethernet: myricom: myri10ge: myri10ge.c: Cleaning up missing null-terminate after strncpy call xen-netfront: Fix handling packets on compound pages with skb_linearize net: fec: Support phys probed from devicetree and fixed-link smsc: replace WARN_ON() with WARN_ON_SMP() xen-netback: Don't deschedule NAPI when carrier off net: ethernet: qlogic: qlcnic: Remove duplicate object file from Makefile wan: wanxl: Remove typedefs from struct names m68k/atari: EtherNEC - ethernet support (ne) net: ethernet: ti: cpmac.c: Cleaning up missing null-terminate after strncpy call hdlc: Remove typedefs from struct names airo_cs: Remove typedef local_info_t atmel: Remove typedef atmel_priv_ioctl com20020_cs: Remove typedef com20020_dev_t ethernet: amd: Remove typedef local_info_t net: Always untag vlan-tagged traffic on input. drivers: net: Add APM X-Gene SoC ethernet driver support. ...		2014-08-13 18:27:40 -06:00
..
.gitignore
adummy.c
ambassador.c
ambassador.h
atmtcp.c	drivers/atm/atmtcp.c: fix error return code	2014-08-07 16:02:57 -07:00
eni.c	drivers: atm: fix %d confusingly prefixed with 0x in format strings	2014-08-05 13:04:32 -07:00
eni.h
firestream.c	atm: firestream: Use del_timer_sync() in teardown path	2014-03-25 21:06:02 -04:00
firestream.h
fore200e.c	atm: fore200e.c: Cleaning up uninitialized variables	2014-06-02 17:11:03 -07:00
fore200e.h
he.c	atm: use pci_zalloc_consistent	2014-08-08 15:57:28 -07:00
he.h
horizon.c
horizon.h
idt77105.c	atm: idt77105: Use del_timer_sync() in exit path	2014-03-25 21:06:02 -04:00
idt77105.h
idt77252_tables.h
idt77252.c	atm: use pci_zalloc_consistent	2014-08-08 15:57:28 -07:00
idt77252.h
iphase.c
iphase.h
Kconfig
lanai.c
Makefile
midway.h
nicstar.c	atm: nicstar: remove interruptible_sleep_on_timeout	2014-02-27 15:22:46 -05:00
nicstar.h
nicstarmac.c
nicstarmac.copyright
solos-attrlist.c
solos-pci.c	solos-pci: fix error return code	2014-08-07 16:02:57 -07:00
suni.c
suni.h
tonga.h
uPD98401.h
uPD98402.c
uPD98402.h
zatm.c
zatm.h
zeprom.h