android_kernel_xiaomi_sm8350/net/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
..
addr.c
addr.h
atm_misc.c
atm_sysfs.c
br2684.c
clip.c net neigh: RCU conversion of neigh hash table 2010-10-05 14:54:36 -07:00
common.c
common.h
ioctl.c
Kconfig
lec_arpc.h
lec.c
lec.h
Makefile
mpc.c ATM: mpc, fix use after free 2010-10-11 11:05:42 -07:00
mpc.h
mpoa_caches.c
mpoa_caches.h
mpoa_proc.c
pppoatm.c
proc.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
protocols.h
pvc.c
raw.c
resources.c
resources.h
signaling.c
signaling.h
svc.c