bproj: Updates from LGE's v30b P970 drop
Revert some changes, enable modem control
Merge remote-tracking branch 'github/android-omap3-3.0' into cm10-linux-stable

Conflicts:
	drivers/spi/ifx_n721_spi.c

Change-Id: Ie8841ffc1cf66ec061a44061c93b763463c9d7df
tspdrv: Add timed interface

For simpler compatibility with the standard Android vibration code
ifx_n721: Explicitly fail if attempting to open a tty before it's ready
Merge commit '02d536ffdcc84305e0b74635ee87bb7634f479eb' into cm10-linux-stable
Merge commit 'b162f578dce965a467bc01c12bd8318eb051a937' into cm10-linux-stable
bcm4329: Fixup btcoex
aat2870_bl: Resolve race condition with userspace on resume
Revert "bcm4329: Fixup btcoex"

This reverts commit 22482890297ce3064682d0d4f4a942667a67fcda.
bcm4329: Fixup btcoex

And now the real patch instead of the update experiment...
Merge remote-tracking branch 'github/android-omap3-3.0' into cm10-linux-stable