power: pm8921-bms: fix reading battery id
power: pm8921-bms: add support for aries's batteries

Conflicts:
	arch/arm/mach-msm/Makefile

Conflicts:

	arch/arm/mach-msm/Makefile
power: pm8921-bms: remove support for lge_2100_mako battery

Conflicts:
	drivers/power/pm8921-bms.c

Conflicts:

	drivers/power/pm8921-bms.c
msm: lge: mako: pmic: fix battery and charging for aries
msm: lge: mako: misc: add support for isa1200 vibrator
msm: lge: mako: pmic: fix vol-down key
msm: lge: mako: pmic: fix led brightness
Revert "usb: ks_bridge: Add support for multiple instance of driver"

This reverts commit 54aeb828d25f916d23a593162ceb8bd5568da8d2.

Conflicts:
	drivers/usb/misc/ks_bridge.c
mako: add primaconfig driver which allows changing the mac address of prima wlan driver
prima: abort init when using primaconfig and custom mac is not set to prevent registering on AP with wrong address
Adding version2 Synaptics touchpad driver by Unixphere

Change-Id: Id9608b6d770f089704d32e3e5f746e164dd3b230
Polished driver to match v1 features and still not enabled in main build

Change-Id: I198bab73b2ac1bafa13b354f1d5375373ac62548

Conflicts:

	arch/arm/mach-omap2/board-notle.c
Glass touchpad version 3

Change-Id: I073a12138c8bfa8f53e50cfa5c8e73bd55877963

Conflicts:

	arch/arm/configs/notle_defconfig
	arch/arm/mach-omap2/board-notle.c
Moved disable irq in probe to avoid suspend() failure

Change-Id: I8cd723506522fbc1ddb9953d648a7de4035583b1
input: rmi4: fixes for aries
- fix build
- selective bug fixes
- remove CMM hacks
- remove unneeeded code
- add f1a and fw_update

Change-Id: Ie646824542580e2d000513f6447181e75ba0a3ed
arch-msm: lge: mako: register rmi4 touchscreen