Revert "usb: gadget: msm72k_udc: add include to msch/board_htc.h"

This reverts commit 9deed9c6efa0e5d81c299e24a5399ec143a82dde.
Revert "arm: drivers: usb: gadget: msm72k_udc: HTC: add usb_register_notifier function."

This reverts commit 832a5831933a354bcdbb1a8a9cf63afe514a8ab1.

Conflicts:

	arch/arm/mach-msm/include/mach/board_htc.h
shooter: add charging support

squashed commit of:

commit 8f43df698d68b9b8ae5a9c1c60dcf2e50500dd04
Author: Ethan Chen <intervigil@gmail.com>
Date:   Fri Apr 20 22:16:12 2012 -0700

    USB: msm: add support for HTC regulator, connect notification

commit 23926e863bb90f58a3acd50ef832069c69136413
Author: Ethan Chen <intervigil@gmail.com>
Date:   Fri Apr 20 23:30:02 2012 -0700

    USB: msm: use void for vbus_power return type

commit 5c3f65c625e700c357a40afe9461ae52fc19ab48
Author: Ethan Chen <intervigil@gmail.com>
Date:   Fri Apr 20 23:46:06 2012 -0700

    msm: htc8x60: remove functions duplicated in drivers/usb/otg/msm_otg

commit 1bec53a49b9d62c0f09dc28a12bb0153675290f8
Author: Ethan Chen <intervigil@gmail.com>
Date:   Fri Apr 20 23:58:09 2012 -0700

    msm: htc8x60: set up msm_otg_pdata for ci13xxx_msm

commit 72ac87c6c5c1f6abf745228b90c298eca3d06b38
Author: Ethan Chen <intervigil@gmail.com>
Date:   Sat Apr 21 02:03:01 2012 -0700

    msm: msm8x60: add missing usb gadget device resources
netfilter: qtaguid: initialize a local var to keep compiler happy.

There was a case that might have seemed like new_tag_stat was not
initialized and actually used.
Added comment explaining why it was impossible, and a BUG()
in case the logic gets changed.

Change-Id: I1eddd1b6f754c08a3bf89f7e9427e5dce1dfb081
Signed-off-by: JP Abgrall <jpa@google.com>
netfilter: xt_qtaguid: fix ipv6 protocol lookup

When updating the stats for a given uid it would incorrectly assume
IPV4 and pick up the wrong protocol when IPV6.

Change-Id: Iea4a635012b4123bf7aa93809011b7b2040bb3d5
Signed-off-by: JP Abgrall <jpa@google.com>
sync: Add synchronization framework

not run through checkpatch yet.

Change-Id: I209f9db2824e0313f467f11ab09e5f54f0a4a6b5
Signed-off-by: Erik Gilling <konkers@android.com>
sw_sync: add cpu based sync driver

Change-Id: I1042851f5e30f9fdc2f35bdad84123bcf108560f
Signed-off-by: Erik Gilling <konkers@android.com>
sync: add timestamps to sync_pts

Change-Id: I2ad855072b86873880769a09a3176e85aa1199d7
Signed-off-by: Erik Gilling <konkers@android.com>
sync: add debugfs support

Change-Id: I8a7ea63e454fbeee1ecf17e6c3caff7c43b24734
Signed-off-by: Erik Gilling <konkers@android.com>
sw_sync: add debug support

Change-Id: Ibcc5fa8cb36e283cdf0e3308064876722e2675fc
Signed-off-by: Erik Gilling <konkers@android.com>
sync: add ioctl to get fence data

Change-Id: I71410aef7e03a52562f7cb15b993ac8441b1fa12
Signed-off-by: Erik Gilling <konkers@android.com>
sw_sync: add fill_driver_data support

Change-Id: Ib3812d282db56362d82f5ccc9a12b7d2100ab93a
Signed-off-by: Erik Gilling <konkers@android.com>
sync: add poll support

Change-Id: I294e481bba92658e6dd26f157ddbf0e9ff4ce8a5
Signed-off-by: Erik Gilling <konkers@android.com>
cpufreq: interactive: configurable delay before raising above hispeed

Change-Id: I4d6ac40b23a3790d48e30c37408284e9f955e8fa
Signed-off-by: Todd Poynor <toddpoynor@google.com>
cpufreq: interactive: adjust code and documentation to match

Change-Id: If59c668d514a29febe5c35404fd9d01df8548eb1
Signed-off-by: Todd Poynor <toddpoynor@google.com>
htc: 8x60: fix smi clock
misc: isl: use gpio_get_value_cansleep
input: gpio_input: use gpio_get_value_cansleep instead of gpio_get_value

This fixes pyramid volume button issue.
drivers:input:touchscreen: disabling the unlock page (credit to bradsh1)
Signed-off-by: vorbeth <vorbeth@gmail.com>
cpufreq: interactive: based hispeed bump on target freq, not actual

For systems that set a common speed for all CPUs, checking current
speed here could bypass the intermediate hispeed bump decision for
this CPU when another CPU was already at hispeed.  This could
result in an overly high setting (for all CPUs) in situations
where all CPUs were about to drop to load levels that map to
hispeed or below.

Change-Id: I186f23dcfc5e2b6336cab8b0327f0c8a9a4482bc
Signed-off-by: Todd Poynor <toddpoynor@google.com>