Merge branch 'android-3.8' of ti-android-kernel/kernel-common into p-ti-android-3.8.y
authorPraneeth Bajjuri <praneeth@ti.com>
Thu, 21 Mar 2013 03:41:09 +0000 (22:41 -0500)
committerPraneeth Bajjuri <praneeth@ti.com>
Thu, 21 Mar 2013 03:41:09 +0000 (22:41 -0500)
commitc1049aa688cf8e600312a90a63cc7cd0c7bf261b
tree77709237b849acace369dbd7603b9898b35a339a
parenta91f8e121dbe0b5fb84000d9ae14fac8880c44a7
parent5995fe0cda85b4160dffda6cbe2c6b5d7f44d7b6
Merge branch 'android-3.8' of ti-android-kernel/kernel-common into p-ti-android-3.8.y

Integrate https://android.googlesource.com/kernel/common/ experimental/android-3.8

* 'android-3.8' of ti-android-kernel/kernel-common: (362 commits)
  Revert "ARM: cache-l2x0: update workaround for PL310 errata 727915"
  netfilter: xt_qtaguid: fix bad tcp_time_wait sock handling
  usb: gadget: Fix android gadget driver build
  HACK: usb: gadget: Fix enumeration on boot
  usb: gadget: android: Fixes and hacks to make android usb gadget compile on 3.8
  ARM: decompressor: Flush tlb before swiching domain 0 to client mode
  ARM: mm: Split memory banks that span multiple sections when sparsemem is enabled
  pstore/ram: Restore ecc information block
  mmc: block: Remove call to mmc_blk_set_blksize
  gpu: ion: Remove __GFP_NO_KSWAPD
  gpu: ion: __dma_page_cpu_to_dev -> arm_dma_ops.sync_single_for_device hack
  ARM: fiq_debugger: Update tty code for 3.8
  ARM: fiq_debugger: Use kmsg_dumper to dump kernel logs
  ARM: fiq_debugger: Fix to compile on 3.7
  usb: otg: otg-wakelock: Fix build for 3.7
  net: bluetooth: Remove the AID_NET_BT* gid numbers
  sync: fix timeout = 0 wait behavior
  power: android-battery: push uevent whenever charge source changes
  power: android-battery: remove ac and usb supplies
  base: sync: Include seq_file.h in sync.h
  ...

Conflicts:
arch/arm/common/Kconfig
arch/arm/common/Makefile
arch/arm/mm/mmu.c

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
30 files changed:
arch/arm/Kconfig
arch/arm/common/Kconfig
arch/arm/common/Makefile
arch/arm/kernel/smp.c
arch/arm/mm/mmu.c
block/genhd.c
block/partition-generic.c
drivers/Kconfig
drivers/Makefile
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/leds/Kconfig
drivers/leds/Makefile
drivers/misc/Kconfig
drivers/net/tun.c
drivers/usb/otg/Kconfig
drivers/usb/otg/Makefile
include/net/bluetooth/hci.h
include/net/bluetooth/hci_core.h
kernel/cgroup.c
kernel/fork.c
mm/shmem.c
net/bluetooth/amp.c
net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/sco.c
net/ipv4/af_inet.c
net/ipv4/tcp.c
net/wireless/sme.c