tmp_suning_uos_patched/drivers/usb/atm
Linus Torvalds 5f05647dd8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits)
  bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.
  vlan: Calling vlan_hwaccel_do_receive() is always valid.
  tproxy: use the interface primary IP address as a default value for --on-ip
  tproxy: added IPv6 support to the socket match
  cxgb3: function namespace cleanup
  tproxy: added IPv6 support to the TPROXY target
  tproxy: added IPv6 socket lookup function to nf_tproxy_core
  be2net: Changes to use only priority codes allowed by f/w
  tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled
  tproxy: added tproxy sockopt interface in the IPV6 layer
  tproxy: added udp6_lib_lookup function
  tproxy: added const specifiers to udp lookup functions
  tproxy: split off ipv6 defragmentation to a separate module
  l2tp: small cleanup
  nf_nat: restrict ICMP translation for embedded header
  can: mcp251x: fix generation of error frames
  can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set
  can-raw: add msg_flags to distinguish local traffic
  9p: client code cleanup
  rds: make local functions/variables static
  ...

Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and
drivers/net/wireless/ath/ath9k/debug.c as per David
2010-10-23 11:47:02 -07:00
..
cxacru.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-09-09 22:27:33 -07:00
Kconfig USB: Remove redundant dependencies on USB_ATM. 2008-05-02 10:25:57 -07:00
Makefile usb: makefile cleanup 2010-10-22 10:22:07 -07:00
speedtch.c USB: speedtouch: fixed more brace and spacing coding style issues 2010-08-10 14:35:34 -07:00
ueagle-atm.c param: simple locking for sysfs-writable charp parameters 2010-08-11 23:04:31 +09:30
usbatm.c USB: speedtouch: fixed more brace and spacing coding style issues 2010-08-10 14:35:34 -07:00
usbatm.h usb: atm: fixed spacing and indentation coding style issues 2010-08-10 14:35:35 -07:00
xusbatm.c usb: atm: fixed spacing and indentation coding style issues 2010-08-10 14:35:35 -07:00