JHash 3
Voodoo Sound v10

Patches originally applied by bedwa, I rebased them into a single patch and merged them.

This includes his fixup patches

Conflicts:

	sound/soc/codecs/wm8994_samsung.c
Fix up path after call. Fixes issues with voodoo sound and the like.
genirq: pm: Fix the enable ordering in resume
USB: Fix unplug of device with active streams

upstream commit: b214f191d95ba4b5a35aebd69cd129cf7e3b1884

If I unplug a device while the UAS driver is loaded, I get an oops
in usb_free_streams().  This is because usb_unbind_interface() calls
usb_disable_interface() which calls usb_disable_endpoint() which sets
ep_out and ep_in to NULL.  Then the UAS driver calls usb_pipe_endpoint()
which returns a NULL pointer and passes an array of NULL pointers to
usb_free_streams().

I think the correct fix for this is to check for the NULL pointer
in usb_free_streams() rather than making the driver check for this
situation.  My original patch for this checked for dev->state ==
USB_STATE_NOTATTACHED, but the call to usb_disable_interface() is
conditional, so not all drivers would want this check.

Note from Sarah Sharp: This patch does avoid a potential dereference,
but the real fix (which will be implemented later) is to set the
.soft_unbind flag in the usb_driver structure for the UAS driver, and
all drivers that allocate streams.  The driver should free any streams
when it is unbound from the interface.  This avoids leaking stream rings
in the xHCI driver when usb_disable_interface() is called.

This should be queued for stable trees back to 2.6.35.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: stable@kernel.org
usb battery drain fix by farmatito
input: evdev: Add missing wake_lock_destroy

Signed-off-by: Benoit Goby <benoit@android.com>
Add undervolting interface via sysfs

Non-OC variant of netarchy's voltage control patches

Signed-off-by: Andrew Dodd <atd7@cornell.edu>
Update gitignores
cpufreq-c110b: Ensure that scaling_available_freqs is populated in sysfs

Based on netarchy's patch with some names changed for consistency
with the rest of the file.

Signed-off-by: Andrew Dodd <atd7@cornell.edu>
wm8994: rename voodoo_sound to wm8994_sound to use controls built-in to DSP Manager
fimc: debugging
bcmdhd: Backport from I9100 update4

bcmdhd: Import Dempsey customizations (GPIO oob stuff)

Signed-off-by: Andrew Dodd <atd7@cornell.edu>
mach-aries: Rename wifi from bcm4330_wlan to bcmdhd_wlan for new
wifi driver
config: Enable new bcmdhd driver

config: Changes for new wifi driver:
Switch from WEXT to NL80211
Disable USB RNDIS until it can be forward-ported to new net code
bcmdhd: Bring MAC address handling in line with Galaxy S II

RDWR_MACADDR looks like it's broken - it effectively behaves like
WRITE_MACADDR in the old driver, and the new driver is clearly
broken as it creats .nvmac.info but doesn't write anything to it

Do it like the GSII for now.

Signed-off-by: Andrew Dodd <atd7@cornell.edu>
net: wireless: bcmdhd: Add FW reloading in case of FW hang

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Decrease event wake_lock timeout to 1500 ms

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Fix proper scan command even if request is NULL

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Fix crash on dhdsdio_probe_attach() failure

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>