Merge branch 'linux-3.8.y' of http://git.kernel.org/pub/scm/linux/kernel/git/stable...

* 'linux-3.8.y' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (43 commits)
  Linux 3.8.11
  ARM: 7692/1: iop3xx: move IOP3XX_PERIPHERAL_VIRT_BASE
  ARM: 7699/1: sched_clock: Add more notrace to prevent recursion
  tracing: Fix selftest function recursion accounting
  net: drop dst before queueing fragments
  net: fix incorrect credentials passing
  net: rate-limit warn-bad-offload splats.
  tcp: call tcp_replace_ts_recent() from tcp_ack()
  net: cdc_mbim: remove bogus sizeof()
  net: mvneta: fix improper tx queue usage in mvneta_tx()
  esp4: fix error return code in esp_output()
  net: mvmdio: add select PHYLIB
  tcp: Reallocate headroom if it would overflow csum_start
  tcp: incoming connections might use wrong route under synflood
  rtnetlink: Call nlmsg_parse() with correct header length
  ipv6/tcp: Stop processing ICMPv6 redirect messages
  netfilter: don't reset nf_trace in nf_reset()
  af_unix: If we don't care about credentials coallesce all messages
  bonding: fix l23 and l34 load balancing in forwarding path
  bonding: IFF_BONDING is not stripped on enslave failure
  ...

Conflicts:
	net/nfc/llcp/sock.c

Signed-off-by: Dan Murphy <dmurphy@ti.com>

diff --cc net/bluetooth/sco.c
Simple merge

diff --cc net/nfc/llcp/sock.c
Simple merge