Merge remote-tracking branch 'origin/p-ti-linux-3.8.y' into p-ti-android-3.8.y

* origin/p-ti-linux-3.8.y: (146 commits)
  ARM: omap2plus_defconfig: enable ocp2scp driver
  Linux 3.8.6
  bonding: get netdev_rx_handler_unregister out of locks
  smsc75xx: fix jumbo frame support
  pch_gbe: fix ip_summed checksum reporting on rx
  net: fq_codel: Fix off-by-one error
  net: fix the use of this_cpu_ptr
  net: ethernet: cpsw: fix erroneous condition in error check
  net: add a synchronize_net() in netdev_rx_handler_unregister()
  ks8851: Fix interpretation of rxlen field.
  ipv6: don't accept node local multicast traffic from the wire
  ipv6: don't accept multicast traffic with scope 0
  ipv6: fix bad free of addrconf_init_net
  fec: Fix the build as module
  DM9000B: driver initialization upgrade
  atl1e: drop pci-msi support because of packet corruption
  aoe: reserve enough headroom on skbs
  net: fix *_DIAG_MAX constants
  drivers: net: ethernet: cpsw: use netif_wake_queue() while restarting tx queue
  drivers: net: ethernet: davinci_emac: use netif_wake_queue() while restarting tx queue
  ...

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

diff --cc drivers/usb/gadget/udc-core.c
Simple merge

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