Rohit Vaswani a76e99abc5 Merge branch 'Linux 3.0.21' into msm-3.0 ...

Merge Upstream's stable 3.0.21 branch into msm-3.0
This consists 814 commits and some merge conflicts.

The merge conflicts are because of some local changes to
msm-3.0 as well as some conflicts between google's tree and
the upstream tree.

Conflicts:
	arch/arm/kernel/head.S
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
	drivers/mmc/core/core.c
	drivers/tty/serial/serial_core.c
	drivers/usb/host/ehci-hub.c
	drivers/usb/serial/qcserial.c
	fs/namespace.c
	fs/proc/base.c

Change-Id: I62e2edbe213f84915e27f8cd6e4f6ce23db22a21
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>

2012-03-30 00:09:34 -07:00

..

netfilter

Merge remote-tracking branch 'common/android-3.0' into msm-3.0

2011-11-16 13:52:50 -08:00

af_inet.c

Merge commit 'v3.0-rc7' into android-3.0

2011-07-12 20:10:37 -07:00

ah4.c

ah: Don't return NET_XMIT_DROP on input.

2012-02-03 09:18:54 -08:00

arp.c

net: fix NULL dereferences in check_peer_redir()

2012-02-13 11:06:13 -08:00

cipso_ipv4.c

inet: add RCU protection to inet->opt

2011-04-28 13:16:35 -07:00

datagram.c

ipv4: Lock socket and use cork flow in ip4_datagram_connect().

2011-05-08 13:48:57 -07:00

devinet.c

Merge branch 'Linux 3.0.21' into msm-3.0

2012-03-30 00:09:34 -07:00

esp4.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

fib_frontend.c

Disable rp_filter for IPsec packets

2011-04-10 18:50:59 -07:00

fib_lookup.h

ipv4: Fix nexthop caching wrt. scoping.

2011-03-24 18:06:47 -07:00

fib_rules.c

ipv4: Use flowi4 in FIB layer.

2011-03-12 15:08:49 -08:00

fib_semantics.c

net,rcu: convert call_rcu(fc_rport_free_rcu) to kfree_rcu()

2011-05-07 22:50:55 -07:00

fib_trie.c

Add appropriate <linux/prefetch.h> include for prefetch users

2011-05-22 21:41:57 -07:00

gre.c

gre: fix improper error handling

2011-08-15 18:31:39 -07:00

icmp.c

icmp: Fix regression in nexthop resolution during replies.

2011-08-15 18:31:37 -07:00

igmp.c

igmp: Avoid zero delay when receiving odd mixture of IGMP queries

2012-01-12 11:35:41 -08:00

inet_connection_sock.c

seqlock: Get rid of SEQLOCK_UNLOCKED

2011-05-24 15:22:17 +02:00

inet_diag.c

inet_diag: fix inet_diag_bc_audit()

2011-06-17 16:25:39 -04:00

inet_fragment.c

…

inet_hashtables.c

net: Compute protocol sequence numbers and fragment IDs using MD5.

2011-08-15 18:31:35 -07:00

inet_lro.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

inet_timewait_sock.c

tcp: fix inet_twsk_deschedule()

2011-02-19 18:59:04 -08:00

inetpeer.c

net: Compute protocol sequence numbers and fragment IDs using MD5.

2011-08-15 18:31:35 -07:00

ip_forward.c

ipv4: Fix 'iph' use before set.

2011-05-12 23:03:46 -04:00

ip_fragment.c

ipv4: Don't use enums as bitmasks in ip_fragment.c

2011-05-17 17:28:02 -04:00

ip_gre.c

net: fix NULL dereferences in check_peer_redir()

2012-02-13 11:06:13 -08:00

ip_input.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ip_options.c

ip_options_compile: properly handle unaligned pointer

2011-05-31 15:11:02 -07:00

ip_output.c

net: fix NULL dereferences in check_peer_redir()

2012-02-13 11:06:13 -08:00

ip_sockglue.c

inet: add RCU protection to inet->opt

2011-04-28 13:16:35 -07:00

ipcomp.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ipconfig.c

net: have ipconfig not wait if no dev is available

2012-01-06 14:14:08 -08:00

ipip.c

ipip, sit: copy parms.name after register_netdevice

2012-01-06 14:13:45 -08:00

ipmr.c

ipv4: use RT_TOS after some rt_tos conversions

2011-08-15 18:31:39 -07:00

Kconfig

ipv4: Remove fib_hash.

2011-02-01 15:35:25 -08:00

Makefile

sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size

2011-06-14 09:08:47 -07:00

netfilter.c

netfilter: TCP and raw fix for ip_route_me_harder

2011-10-03 11:40:53 -07:00

ping.c

ipv4, ping: Remove duplicate icmp.h include

2011-06-20 13:04:38 -07:00

proc.c

tcp: Replace time wait bucket msg by counter

2010-12-08 12:16:33 -08:00

protocol.c

net: add __rcu annotations to protocol

2010-10-27 11:37:31 -07:00

raw.c

net: convert %p usage to %pK

2011-05-24 01:13:12 -04:00

route.c

net: fix NULL dereferences in check_peer_redir()

2012-02-13 11:06:13 -08:00

syncookies.c

tcp: initialize variable ecn_ok in syncookies path

2011-10-03 11:40:54 -07:00

sysctl_net_ipv4.c

net: ping: fix build failure

2011-05-17 14:16:58 -04:00

sysfs_net_ipv4.c

sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size

2011-06-14 09:08:47 -07:00

tcp_bic.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_cong.c

…

tcp_cubic.c

tcp_cubic: limit delayed_ack ratio to prevent divide error

2011-05-08 15:51:57 -07:00

tcp_diag.c

…

tcp_highspeed.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_htcp.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_hybla.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_illinois.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_input.c

tcp: properly update lost_cnt_hint during shifting

2011-11-11 09:36:28 -08:00

tcp_ipv4.c

Merge branch 'Linux 3.0.21' into msm-3.0

2012-03-30 00:09:34 -07:00

tcp_lp.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

tcp_minisocks.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-12-08 13:47:38 -08:00

tcp_output.c

tcp: fix tcp_trim_head() to adjust segment count with skb MSS

2012-02-03 09:19:04 -08:00

tcp_probe.c

net: ipv4: tcp_probe: cleanup snprintf() use

2010-11-17 12:27:46 -08:00

tcp_scalable.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_timer.c

tcp: Remove debug macro of TCP_CHECK_TIMER

2011-02-20 11:10:14 -08:00

tcp_vegas.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_vegas.h

…

tcp_veno.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_westwood.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_yeah.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

tcp.c

Merge remote-tracking branch 'common/android-3.0' into msm-3.0

2011-11-16 13:52:50 -08:00

tunnel4.c

tunnels: add __rcu annotations

2010-10-27 11:37:32 -07:00

udp_impl.h

…

udp.c

net: refine {udp|tcp|sctp}_mem limits

2011-07-07 00:27:05 -07:00

udplite.c

net: fix nulls list corruptions in sk_prot_alloc

2010-12-16 14:26:56 -08:00

xfrm4_input.c

…

xfrm4_mode_beet.c

…

xfrm4_mode_transport.c

…

xfrm4_mode_tunnel.c

ipv4: Don't pre-seed hoplimit metric.

2010-12-12 22:08:17 -08:00

xfrm4_output.c

xfrm4: Don't call icmp_send on local error

2011-07-01 17:33:19 -07:00

xfrm4_policy.c

ipv4: fix ipsec forward performance regression

2011-11-11 09:36:25 -08:00

xfrm4_state.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6

2011-05-11 14:26:58 -04:00

xfrm4_tunnel.c

net: struct xfrm_tunnel in read_mostly section

2010-08-30 13:50:45 -07:00