'SuperRAM' :P
Revert "changed gpu oc sysfs to correspond to new freq"

This reverts commit 10ccef888d9163ea93ce5fa405431918d4ffd4e2.
Revert "Changed GPU onload freq from 307,384,512Mhz to 384,460,537Mhz respectivly"

This reverts commit e2c311ae0809282d5ac2866fcdc5deb1b6ac9c43.
Update bcmdhd wireless driver to latest 3.4 upstream
Revert "Update bcmdhd wireless driver to latest 3.4 upstream"

This reverts commit 5a7b73410ecde89bd80266a607b33fd5d0abbf16.
Revert "cpufreq: Manage only online cpus"

This reverts commit ddbc62cab52cd9e723a067e705ae9f618354c0c9.
added SR config
Newest interactive governor (backported from kernel 3.4)
Disabled RAM console to reclaim some RAM

Conflicts:
	arch/arm/configs/tuna-DirtyV-SR_drfconfig
OMAP: DSSCOMP: Use vmalloc for large allocations

Use vmalloc for large allocations that do not need to be
contiguous.  This keeps more memory for kmalloc.

Change-Id: I76290a16498f8846e58559b867013b62bfa3662e
Signed-off-by: Lajos Molnar <lajos@ti.com>
hrtimer: Consider preemption when migrating hrtimer cpu_bases

When switching to a new cpu_base in switch_hrtimer_base(), we
briefly enable preemption by unlocking the cpu_base lock in two
places. During this interval it's possible for the running thread
to be swapped to a different CPU.

Consider the following example:

CPU #0                                 CPU #1
----                                   ----
hrtimer_start()                        ...
 lock_hrtimer_base()
 switch_hrtimer_base()
  this_cpu = 0;
  target_cpu_base = 0;
  raw_spin_unlock(&cpu_base->lock)
<migrate to CPU 1>
...                                    this_cpu == 0
                                       cpu == this_cpu
                                       timer->base = CPU #0
                                       timer->base != LOCAL_CPU

Since the cached this_cpu is no longer accurate, we'll skip the
hrtimer_check_target() check. Once we eventually go to program
the hardware, we'll decide not to do so since it knows the real
CPU that we're running on is not the same as the chosen base. As
a consequence, we may end up missing the hrtimer's deadline.

Fix this by updating the local CPU number each time we retake a
cpu_base lock in switch_hrtimer_base().

Another possibility is to disable preemption across the whole of
switch_hrtimer_base.  This looks suboptimal since preemption
would be disabled while waiting for lock(s).

Change-Id: I3f76d528ab2288ef5f950f4d048e7f3fa6cf1228
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
hrtimer: Prevent enqueue of hrtimer on dead CPU

When switching the hrtimer cpu_base, we briefly allow for
preemption to become enabled by unlocking the cpu_base lock.
During this time, the CPU corresponding to the new cpu_base
that was selected may in fact go offline. In this scenario, the
hrtimer is enqueued to a CPU that's not online, and therefore
it never fires.

As an example, consider this example:

CPU #0                          CPU #1
----                            ----
...                             hrtimer_start()
                                 lock_hrtimer_base()
                                 switch_hrtimer_base()
                                  cpu = hrtimer_get_target() -> 1
                                  spin_unlock(&cpu_base->lock)
                                <migrate thread to CPU #0>
                                <offline>
spin_lock(&new_base->lock)
this_cpu = 0
cpu != this_cpu
enqueue_hrtimer(cpu_base #1)

To prevent this scenario, verify that the CPU corresponding to
the new cpu_base is indeed online before selecting it in
hrtimer_switch_base(). If it's not online, fallback to using the
base of the current CPU.

Change-Id: I6359cb299ba7e08abf25d3360fcdd925b4c03b69
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks

Until the OMAP4 code is converted to disable the use of the clock
framework-based clockdomain enable/disable sequence, any clock used as
a hwmod main_clk must have a clockdomain associated with it.  This
patch populates some clock structure clockdomain names to resolve warnings during the kernel init.
slub: fix a possible memory leak

Memory allocated by kstrdup should be freed,
when kmalloc(kmem_size, GFP_KERNEL) is failed.

Acked-by: Christoph Lameter <cl@linux.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Joonsoo Kim <js1304@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
OMAP: omap-mcbsp: Holding min latency constraint

Holding min latency constraint to reduce mp3 playback current.
Deeper states MPU RET/OFF is overhead and consume more power than savings.

Change-Id: Ia69e4ed8a52961e3e2007efbd03d67251066ff4e
Signed-off-by: Raviraj N. Somnache <x0172606@ti.com>
Revert "Newest interactive governor (backported from kernel 3.4)"

This reverts commit 42bb4562a8da0d3d88ab1d599dc3bc8eaadb5f45.
Revert "Added FSync Control version 1."

This reverts commit 1219a9b777b85423f424ee9df502bcd4b2082872.
fs/dyn_sync_cntrl: dynamic sync control - Thanks Faux123

Signed-off-by: Dan Trifan <jimsth@gmail.com>

Conflicts:
	arch/arm/configs/ktmanta_defconfig

Signed-off-by: Dan Trifan <jimsth@gmail.com>
fs/dyn_sync_cntrl: explictly check if dyn fsync control is active prior
to performing fsync operations

Signed-off-by: Dan Trifan <jimsth@gmail.com>
dynamic filesync: add some cache optimizations

and clean up file format and typos

bump version to 1.1

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