omap: voltage: add missing function 'omap_get_nominal_voltage'
Edison: use edison device tree for compiling
omap: dss: add missing function 'dispc_get_pol_freq'
block: bfq: add config option
defconfig: disable BFQ for now
omap: dss: add missing function 'dispc_calculate_threshold'
omap: dss: manager: remove m2m function, disable BFQ for edison, targa
omap: thermal: update thermal framework to 3.0.31
arch: arm: smp: 3.0.31
omap: opp: IVA OC 500mhz
arm: kernel: patchset to fix behavior of hotplugging and atomic operations
Revert "Revert "Modem: 3.4 backport""

This reverts commit 8ef7ea2256996b8f24a7af1f7393b6982b74aa33.
Intelliplug 2.0

Custom hotplug driver from faux123
Intelliactive Governor

*faux123

intelliactive is based on Latest Google Interactive cpufreq governor from
Google.  The original Interactive provides smooth UI operations but suffers
slight battery drain due to its aggressive policies.  Intelliactive is an
improvement built on top of it.

It has the following enhancements added:
1. self-boost capability from input drivers (no need for PowerHAL assist)
2. two phase scheduling (idle/busy phases to prevent from jumping directly to
   max freq
3. Checks for offline cpus and short circuits some unnecessary checks to
   improve code execution paths
4. removed trace calls
intelliactive: backport to Linux 3.0.x / Linux 3.1.x kernels

Signed-off-by: Paul Reioux <reioux@gmail.com>
intelliactive: tune for OMAP2 SOCs

Signed-off-by: Paul Reioux <reioux@gmail.com>
intelli_plug: switch to use dedicated high priority workqueue

from the shared global workqueue.  This should prevent hang ups while the
global workqueue is busy and cleaned up some logic issues.

give input boost its own workqueue

bump to version 2.2

Signed-off-by: Paul Reioux <reioux@gmail.com>
Intelli_Plug: adapt for dual-core, Intelliactive: add to config
 Asynchronous Fsync: initial extraction of Async Fsync from HTC
intellidemand: minor tweak for better performance

Signed-off-by: Paul Reioux <reioux@gmail.com>