Solve error in DVFS patch which I made by mixing code with oc-branch
Bump kernel version to 0.86
3.0.46
Revert "config: enable zram and swap"

This reverts commit d17e5085563bfd0c15a42e3c074e262d14e9e086.
Revert "Solve error in DVFS patch which I made by mixing code with oc-branch"

This reverts commit 9b820b55b8c88f631f874c89d92ba8bb80a44452.
Revert "Call cpufreq_update_policy on DVFS events."

This reverts commit 04a2363ba7100be74d5cdb45b1a2eacd6e4f2aed.
Call cpufreq_update_policy on DVFS events.

Calls cpufreq_update_policy on DVFS lock/unlock events to ensure that DVFS
locks take effect with the governor's preferred frequency (if higher than
the lock frequency).  Previously the lock would set the frequency to the
target level and expect the governor to reevaluate on a timer, which
ondemand does, but powersave and performance do not.

Change-Id: I19a454d7173afdb99d0a87845285f84606cf24e1
config: enable zram and swap

Change-Id: I83264d79eea4b93997552b1361f413fde68d652d

Conflicts:

	arch/arm/configs/cyanogenmod_captivatemtd_defconfig
	arch/arm/configs/cyanogenmod_fascinatemtd_defconfig
	arch/arm/configs/cyanogenmod_galaxysbmtd_defconfig
	arch/arm/configs/cyanogenmod_vibrantmtd_defconfig
cpufreq: enable and update interactive governor

This is a squashed commit of the following:

cpufreq: interactive: add show_boost sysfs entry

Signed-off-by: jt1134 <jt1134@gmail.com>

cpufreq: interactive: take idle notifications only when active
Register an idle notifier only when the governor is active.  Also
short-circuit work of idle end if the governor is not enabled.

Signed-off-by: Sam Leffler <sleffler@chromium.org>

cpufreq: interactive: keep freezer happy when not current governor
Fix a problem where the hung task mechanism was deeming the interactive
clock boost thread as hung.  This was because the thread is created at
module init but never run/woken up until needed.  If the governor is not
being used this can be forever.  To workaround this explicitly wake up
the thread once all the necessary data structures are initialized.  The
latter required some minor code shuffle.

Signed-off-by: Sam Leffler <sleffler@chromium.org>

cpufreq: interactive: handle speed up and down in the realtime task
Not useful to have a separate, non-realtime workqueue for speed down
events, avoid priority inversion for speed up events.

Signed-off-by: Todd Poynor <toddpoynor@google.com>

cpufreq: interactive: remove input_boost handling
Now handled in userspace Power HAL instead.

Signed-off-by: Todd Poynor <toddpoynor@google.com>

cpufreq: fix interactive bug during hotplug
When a new cpu is added and if does not enter idle
for long, the interactive timer is not started and hence
the cpu remains at lowest frequecny, despite the system
load. This impacts mainly benchmarks. Starting a timer
at governor start to handle low frequency.

Signed-off-by: Narayanan Gopalakrishnan <nargop@codeaurora.org>

cpufreq: interactive: always limit initial speed bump to hispeed
First bump speed up to hispeed_freq whenever the current speed is below
hispeed_freq, instead of only when the current speed is the minimum speed.
The previous code made it too difficult to use hispeed_freq as a common
intermediate speed on systems that frequently run at speeds between
minimum and hispeed_freq.

Signed-off-by: Todd Poynor <toddpoynor@google.com>

cpufreq: interactive: run at fraction of hispeed_freq when load is low
When load is below go_hispeed_load, apply the percentage of CPU load to
a max frequency of hispeed_freq instead of the max speed.  This avoids
jumping too quickly to hispeed_freq when it is a relatively low
percentage of max speed.  This also allows go_hispeed_load to be set to
a high percentage relative to hispeed_freq (as a percentage of max speed,
again useful when hispeed_freq is a low fraction of max speed), to cap
larger loads at hispeed_freq.  For example, a load of 60% will typically
move to 60% of hispeed_freq, not 60% of max speed.  This causes the
governor to apply two different speed caps, depending on whether load is
below or above go_hispeed_load.

Also fix the type of hispeed_freq, which was u64, to match other
speed data types (and avoid overhead and allow division).

Signed-off-by: Todd Poynor <toddpoynor@google.com>

cpufreq: interactive: add boostpulse duration
This makes up for the portions missing that would've been written
by Narayanan Gopalakrishnan but they were missing (duration, and boost
time) and also adds the ability to set duration (which was originally
created by cyanogen)

Signed-off-by: Narayanan Gopalakrishnan <nargop@codeaurora.org>

Change-Id: Iba70ed3580dd04704b0d7b4acde178df7a843b5f

Conflicts:

	arch/arm/configs/cyanogenmod_captivatemtd_defconfig
	arch/arm/configs/cyanogenmod_fascinatemtd_defconfig
	arch/arm/configs/cyanogenmod_galaxysbmtd_defconfig
	arch/arm/configs/cyanogenmod_galaxysmtd_defconfig
	arch/arm/configs/cyanogenmod_vibrantmtd_defconfig
Don't require gstat on OSX

stat -f "%z" also works and is more compatible

Change-Id: I1768bd402cbac09117726fc5008b8ab245495aaa
Merge branch 'android-samsung-3.0-jb-mr0' of https://android.googlesource.com/kernel/samsung into HEAD

Conflicts:
	drivers/gpu/pvr/pvrversion.h

Change-Id: I93433944a5870a934ea7783df66994bffda2673e
Bump kernel version to 0.90