Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android
authorVishal Mahaveer <vishalm@ti.com>
Wed, 6 May 2015 23:49:01 +0000 (18:49 -0500)
committerVishal Mahaveer <vishalm@ti.com>
Wed, 6 May 2015 23:55:31 +0000 (18:55 -0500)
commit6dd9beb3307f0a9ea70f4559fb4d08b577677da8
tree1c42ee51448ce71860b93230708f00ba2230d470
parent898c34394dc67696e9bb8c4aa9e6d48f698ebf6d
parente54f50ba98e638c0ccf5983f1cc6578f7d57e047
Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android

* p-ti-linux-3.14.y-common: (219 commits)
  Revert "usb: dwc3: debugfs: dual role switch through debugfs entries"
  Linux 3.14.41
  nosave: consolidate __nosave_{begin,end} in <asm/sections.h>
  fs: take i_mutex during prepare_binprm for set[ug]id executables
  driver core: bus: Goto appropriate labels on failure in bus_add_device
  memstick: mspro_block: add missing curly braces
  C6x: time: Ensure consistency in __init
  crypto: omap-aes - Fix support for unequal lengths
  wl18xx: show rx_frames_per_rates as an array as it really is
  lib: memzero_explicit: use barrier instead of OPTIMIZER_HIDE_VAR
  e1000: add dummy allocator to fix race condition between mtu change and netpoll
  ksoftirqd: Enable IRQs and call cond_resched() before poking RCU
  RCU pathwalk breakage when running into a symlink overmounting something
  drm/i915: cope with large i2c transfers
  drm/radeon: fix doublescan modes (v2)
  i2c: core: Export bus recovery functions
  IB/mlx4: Fix WQE LSO segment calculation
  IB/core: don't disallow registering region starting at 0x0
  IB/core: disallow registering 0-sized memory region
  stk1160: Make sure current buffer is released
  ...

Conflicts:
drivers/usb/gadget/Kconfig
drivers/usb/gadget/Makefile
drivers/usb/gadget/udc/udc-core.c
drivers/usb/phy/Kconfig
drivers/usb/phy/Makefile
fs/exec.c

Change-Id: I1e169d9d98c508c1965cbdc84e88faf10c8fe777
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Signed-off-by: Subramaniam Chanderashekarapuram <subramaniam.ca@ti.com>
27 files changed:
arch/arm/boot/dts/dra7-evm.dts
arch/x86/kernel/process.c
drivers/usb/gadget/Kconfig
drivers/usb/gadget/Makefile
drivers/usb/gadget/composite.c
drivers/usb/gadget/configfs.c
drivers/usb/gadget/function/Makefile
drivers/usb/gadget/function/f_accessory.c
drivers/usb/gadget/function/f_audio_source.c
drivers/usb/gadget/function/f_fs.c
drivers/usb/gadget/function/f_mtp.c
drivers/usb/gadget/function/f_mtp.h
drivers/usb/gadget/function/f_ptp.c
drivers/usb/gadget/function/f_rndis.c
drivers/usb/gadget/function/rndis.c
drivers/usb/gadget/function/rndis.h
drivers/usb/gadget/function/u_ether.c
drivers/usb/gadget/function/u_ether.h
drivers/usb/gadget/function/u_serial.c
drivers/usb/gadget/legacy/Kconfig
drivers/usb/gadget/legacy/Makefile
drivers/usb/gadget/legacy/android.c
drivers/usb/gadget/udc/udc-core.c
drivers/usb/phy/Kconfig
drivers/usb/phy/Makefile
fs/exec.c
net/ipv4/tcp_output.c