korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
d4fc7eb5c5
linux/drivers/atm
History
Linus Torvalds 8a9ea3237e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
  dp83640: free packet queues on remove
  dp83640: use proper function to free transmit time stamping packets
  ipv6: Do not use routes from locally generated RAs
  |PATCH net-next] tg3: add tx_dropped counter
  be2net: don't create multiple RX/TX rings in multi channel mode
  be2net: don't create multiple TXQs in BE2
  be2net: refactor VF setup/teardown code into be_vf_setup/clear()
  be2net: add vlan/rx-mode/flow-control config to be_setup()
  net_sched: cls_flow: use skb_header_pointer()
  ipv4: avoid useless call of the function check_peer_pmtu
  TCP: remove TCP_DEBUG
  net: Fix driver name for mdio-gpio.c
  ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
  rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
  ipv4: fix ipsec forward performance regression
  jme: fix irq storm after suspend/resume
  route: fix ICMP redirect validation
  net: hold sock reference while processing tx timestamps
  tcp: md5: add more const attributes
  Add ethtool -g support to virtio_net
  ...

Fix up conflicts in:
 - drivers/net/Kconfig:
	The split-up generated a trivial conflict with removal of a
	stale reference to Documentation/networking/net-modules.txt.
	Remove it from the new location instead.
 - fs/sysfs/dir.c:
	Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
	with Eric Biederman's changes for tagged directories.
2011-10-25 13:25:22 +02:00
..
.gitignore [ATM]: Ignore generated file pca200e_ecd.bin2 2006-12-11 14:34:35 -08:00
adummy.c atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
ambassador.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
ambassador.h ATM: Delete no use FILL_RX_POOLS_IN_BH marco 2011-07-08 09:06:31 -07:00
atmtcp.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
eni.c net: add skb frag size accessors 2011-10-19 03:10:46 -04:00
eni.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
firestream.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
firestream.h
fore200e.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
fore200e.h Fix common misspellings 2011-03-31 11:26:23 -03:00
he.c atm: he: Fix undefined sequence points. 2011-04-17 00:07:55 -07:00
he.h atm: [he] rewrite buffer handling in receive path 2010-05-31 00:27:47 -07:00
horizon.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
horizon.h long vs. unsigned long - low-hanging fruits in drivers 2007-10-14 12:41:51 -07:00
idt77105.c atm: idt77105: fix fetch_stats() result 2011-01-21 16:24:23 -08:00
idt77105.h [ATM]: [idt77105] should be __devinit not __init 2006-06-29 16:58:12 -07:00
idt77252_tables.h
idt77252.c Merge branch 'master' into for-next 2011-09-15 15:08:18 +02:00
idt77252.h Fix common misspellings 2011-03-31 11:26:23 -03:00
iphase.c atm/iphase : removal of PCI space dereferences. 2011-10-03 14:09:10 -04:00
iphase.h atm/iphase : removal of PCI space dereferences. 2011-10-03 14:09:10 -04:00
Kconfig Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
lanai.c atm: Convert vmalloc/memset to vzalloc 2011-09-15 13:55:02 +02:00
Makefile Drivers: atm: Makefile: replace the use of <module>-objs with <module>-y 2010-10-21 03:09:48 -07:00
midway.h
nicstar.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
nicstar.h atm: [nicstar] remove virt_to_bus() and support 64-bit platforms 2010-05-31 00:27:46 -07:00
nicstarmac.c atm: [nicstar] reformatted with Lindent 2010-05-31 00:27:46 -07:00
nicstarmac.copyright drivers/atm/: remove CVS keywords 2008-05-20 14:52:25 -07:00
solos-attrlist.c solos: Add 'Firmware' attribute for Traverse overall firmware version 2010-11-08 12:17:04 -08:00
solos-pci.c atm: solos-pci: Fix set-but-unused variable. 2011-04-17 00:11:25 -07:00
suni.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
suni.h atm: [suni] add support for setting loopback and framing modes 2008-06-17 16:19:24 -07:00
tonga.h
uPD98401.h
uPD98402.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
uPD98402.h
zatm.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
zatm.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
zeprom.h