Merge "add backported vsprintf pV format" into ics
Merge "tenderloin_wifi_power: add multiple enable/disable check" into ics
Merge "Revert "Added wakelock short circuiting to allow wifi to sleep"" into ics
Merge "video/msm: HACK to correct lcdc/mdp clocks ref counts" into ics
defconfig: increase available kgsl memory

This bumps the kgsl page_table count from 8 to 24 to help
prevent kgsl OOM errors. Also disables the "disable_shadow_writes"
as it's not clear that is needed and could increase performance.

Change-Id: I7073c2d2c7feb4d13bb8ef6759f46b6d56856acd
disable palm oom-restart

Change-Id: Iea2d0553ea2d52c7f5018e61d0b57eb9e364a2ce
rework headphone switch detection

Change-Id: I4b2f305c166304ff85a93a964c276af4a4fa08ae
Merge "rework headphone switch detection" into ics
Update MPU3050 kernel driver

1. Update MPU3050 drivers to Invensense MPU code update v3.3.4 ported from:
   https://android.googlesource.com/kernel/msm.git/+/android-msm-sony-cm-jb-3.0
2. Enable LSM303DLHA and LSM303DLHM as MPU3050 slaves instead of fake BMA150 and AK8975
3. Proper LSM303DLHA and LSM303DLHM power management when acting as MPU3050 slaves
4. Gyro axis configuration changed
5. Updates to sensor setup by John Newby

Change-Id: I48b03fdb5a45689cbc490ed88db60ed04657073f
DORREGARAY:
Update MPU3050 kernel driver

1. Update MPU3050 drivers to Invensense MPU code update v3.3.4 ported from:
   https://android.googlesource.com/kernel/msm.git/+/android-msm-sony-cm-jb-3.0
2. Enable LSM303DLHA and LSM303DLHM as MPU3050 slaves instead of fake BMA150 and AK8975
3. Proper LSM303DLHA and LSM303DLHM power management when acting as MPU3050 slaves
4. Gyro axis configuration changed
5. Updates to sensor setup by John Newby
Change-Id: I48b03fdb5a45689cbc490ed88db60ed04657073fMerge commit 'refs/changes/33/29733/15' of http://review.cyanogenmod.org/CyanogenMod/hp-kernel-tenderloin into cm-10.1

Conflicts:
	arch/arm/mach-msm/board-tenderloin.c
DORREGARAY:
Update MPU3050 kernel driver

1. Update MPU3050 drivers to Invensense MPU code update v3.3.4 ported from:
   https://android.googlesource.com/kernel/msm.git/+/android-msm-sony-cm-jb-3.0
2. Enable LSM303DLHA and LSM303DLHM as MPU3050 slaves instead of fake BMA150 and AK8975
3. Proper LSM303DLHA and LSM303DLHM power management when acting as MPU3050 slaves
4. Gyro axis configuration changed
5. Updates to sensor setup by John Newby

Conflicts:
	arch/arm/mach-msm/board-tenderloin.c