From: Felipe Balbi <balbi@ti.com>
Date: Mon, 23 Dec 2013 17:22:46 +0000 (-0600)
Subject: Merge tag 'v3.13-rc5' into next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e90b8417af0d01cf8c64da6937c914c89ccf6dc1;p=deliverable%2Flinux.git

Merge tag 'v3.13-rc5' into next

Linux 3.13-rc5

* tag 'v3.13-rc5': (231 commits)
  Linux 3.13-rc5
  aio: clean up and fix aio_setup_ring page mapping
  aio/migratepages: make aio migrate pages sane
  aio: fix kioctx leak introduced by "aio: Fix a trinity splat"
  Don't set the INITRD_COMPRESS environment variable automatically
  mm: fix build of split ptlock code
  pstore: Don't allow high traffic options on fragile devices
  mm: do not allocate page->ptl dynamically, if spinlock_t fits to long
  mm: page_alloc: revert NUMA aspect of fair allocation policy
  Revert "mm: page_alloc: exclude unreclaimable allocations from zone fairness policy"
  mm: Fix NULL pointer dereference in madvise(MADV_WILLNEED) support
  qla2xxx: Fix scsi_host leak on qlt_lport_register callback failure
  target: Remove extra percpu_ref_init
  arm64: ptrace: avoid using HW_BREAKPOINT_EMPTY for disabled events
  ARC: Allow conditional multiple inclusion of uapi/asm/unistd.h
  target/file: Update hw_max_sectors based on current block_size
  iser-target: Move INIT_WORK setup into isert_create_device_ib_res
  iscsi-target: Fix incorrect np->np_thread NULL assignment
  mm/hugetlb: check for pte NULL pointer in __page_check_address()
  fix build with make 3.80
  ...

Conflicts:
	drivers/usb/phy/Kconfig
---

e90b8417af0d01cf8c64da6937c914c89ccf6dc1
diff --cc drivers/usb/phy/Kconfig
index 3e9383698c85,2b41c636a52a..7d1451d5bbea
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@@ -6,14 -6,6 +6,15 @@@ menu "USB Physical Layer drivers
  config USB_PHY
  	def_bool n
  
 +config USB_OTG_FSM
- 	bool "USB 2.0 OTG FSM implementation"
++	tristate "USB 2.0 OTG FSM implementation"
++	depends on USB
 +	select USB_OTG
 +	select USB_PHY
 +	help
 +	  Implements OTG Final State Machine as specified in On-The-Go
 +	  and Embedded Host Supplement to the USB Revision 2.0 Specification.
 +
  #
  # USB Transceiver Drivers
  #