m7: fix proximity sensor issues

Needs http://review.cyanogenmod.org/#/c/49528/

Props to TripNRaver for the fix

Change-Id: Ia6514924b74ce7e4c627b385f1af2cb8f6c66994
usb: gadget: mass_storage: added sysfs entry for cdrom to LUNs

This patch adds a "cdrom" sysfs entry for each mass_storage LUN, just
like "ro" sysfs entry. This allows switching between USB and CD-ROM
emulation without reinserting the module or recompiling the kernel.

Change-Id: Idf83c74815b1ad370428ab9d3e5503d5f7bcd3b6
dlx: re-introduce PANEL_ID_DLX_SONY_RENESAS support

I added esc_byte_ratio = 2 for this panel, even though it wasn't
defined based on this code in the original HTC DLX kernel:

    #ifdef CONFIG_MSM_ALT_DSI_ESCAPE_CLOCK
          esc_byte_ratio = pinfo->mipi.esc_byt
    #else
          esc_byte_ratio = 2;
    #endif

Otherwise, it is a composite of the M7 Sony panel (for new fields
that have been added) and the panel that was in chad's kernel
based on the DLX source drop.

Change-Id: I2db2485a3770b7f469469537ebfb72d8c587dca4
sound: don't enable debug by default

This removes a large number of messages that used to be printed
during audio playback making the log much easier to use.

Change-Id: I67822a11755a098f22c672784a6667c4abc45507
net: wireless: bcmdhd: Enable p2p support bits for p2p device

Change-Id: I62102ead0e72be41d591f9562f3ac27c41b9e395
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Remove PASS_ARP_PACKET define

Change-Id: Ic5787ffb40840def3cb676ce0030c0923b0738c4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Remove chatty message from wl_cfgp2p_act_frm_search

Change-Id: I06ffddddf239443f3684f97a5c31b6872c89d769
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Update to version 1.88.41

- Fix sched scan processing
- Fix NDO processing
- Do not wake dhd_dpc process if not necessary
- Remove unnecessary defines and ifdefs
- Fix SDIO bus wakeup code when idletime was zero case
- Fix OOB interrupt handler was not registered when WLAN on failed case
- Clean up ARP Packet filter code
- Clean up P2P ESCAN source code
- Clean up TDLS code

Change-Id: I6b9a15f0d49c80d72183fd6e9f4b6bb01e450cd4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Update to version 1.88.42

- Add batched scan implementation

Change-Id: I48a36f753597734b2a8865a53f15df30c5ae0d36
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Update to version 1.88.45

	1. Remove WL_SUPPORT_AUTO_CHANNEL codes
	2. add codes for WL_IFACE_COMB_NUM_CHANNELS and
	   WL_CFG80211_P2P_DEV_IF to support concurent mode.
	   (Google Bug : [9892309] support Wifi direct 5GHZ channels)
	   but, remove the WL_IFACE_COM_NUM_CHANELS in Makefile
	3. refactoring the codes for hidden ap roaming
Signed-off-by: Ecco Park <eccopark@broadcom.com>

Conflicts:
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/wl_android.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_cfgp2p.c
	drivers/net/wireless/bcmdhd/wl_cfgp2p.h

Change-Id: If8283f26714196aa971c186c57758c0e64ce87df
net: wireless: bcmdhd: enable WL_IFACE_COMB_NUM_CHANNELS

Change-Id: I5f0649719270e23d88c2eecf61f6827fead50fa3
Signed-off-by: Ecco Park <eccopark@broadcom.com>
net: wireless: bcmdhd: Update Location Service code

	updated the dhd_pno.c based on new firmware which will be
	released today.
	updated the wl_anroid.c based on Robert's requirement

Signed-off-by: Ecco Park <eccopark@broadcom.com>

Conflicts:
	drivers/net/wireless/bcmdhd/common/include/proto/bcmevent.h

Change-Id: I5662c221cc93396c4a18c64f142f6f959c884399
net: wireless: bcmdhd: Fix of Wireless Location Service

	Fixed [10378803] [BATCHED-SCAN] WLS_BATCHING commands often
	return their command back rather than expected outputs
Signed-off-by: Ecco Park <eccopark@broadcom.com>

Change-Id: I0bfe81e6cc16c954067f40ba01a97cf85929e584
net: wireless: bcmdhd: Fix of Wireless Location Service

	Fixed memory Leak in case of rmmod DHD without batching stop.
Signed-off-by: Ecco Park <eccopark@broadcom.com>

Change-Id: Ie7a503ce528c4db81507818a34527bfa11b29bea
AIO: Don't plug the I/O queue in do_io_submit()

Asynchronous I/O latency to a solid-state disk greatly increased
between the 2.6.32 and 3.0 kernels. By removing the plug from
do_io_submit(), we observed a 34% improvement in the I/O latency.

Unfortunately, at this level, we don't know if the request is to
a rotating disk or not.

Change-Id: I404f1fd0c20eff41243f3feae1909723a7eefb3e
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: linux-aio@kvack.org
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
Merge "m7: fix proximity sensor issues" into cm-10.2
Merge "usb: gadget: mass_storage: added sysfs entry for cdrom to LUNs" into cm-10.2
Merge "AIO: Don't plug the I/O queue in do_io_submit()" into cm-10.2
Merge changes Ie7a503ce,I0bfe81e6,I5662c221,I5f064971,If8283f26,I48a36f75,I6b9a15f0,I06ffdddd,Ic5787ffb,I62102ead into cm-10.2

* changes:
  net: wireless: bcmdhd: Fix of Wireless Location Service
  net: wireless: bcmdhd: Fix of Wireless Location Service
  net: wireless: bcmdhd: Update Location Service code
  net: wireless: bcmdhd: enable WL_IFACE_COMB_NUM_CHANNELS
  net: wireless: bcmdhd: Update to version 1.88.45
  net: wireless: bcmdhd: Update to version 1.88.42
  net: wireless: bcmdhd: Update to version 1.88.41
  net: wireless: bcmdhd: Remove chatty message from wl_cfgp2p_act_frm_search
  net: wireless: bcmdhd: Remove PASS_ARP_PACKET define
  net: wireless: bcmdhd: Enable p2p support bits for p2p device
msm_serial_hs_brcm: Fix sleeping while atomic during device open

Change-Id: I00f96f06a397f92402db06a4fe33913a4f862e9e