Revert "mmc: increase read and write timeouts for bad SDHC cards"

This reverts commit 454eaaa2f414e8801cab3763c8f814b5f13d625b.
mmc: use really long write timeout to deal with crappy cards

Several people have noticed that crappy SD cards take much longer to
complete multiple block writes than the 300ms that Linux specifies.
Try to work around this by using a three second write timeout instead.

This is a generalized version of a patch from Chase Maupin
<Chase.Maupin@ti.com>, whose patch description said:

* With certain SD cards timeouts like the following have been seen
  due to an improper calculation of the dto value:
    mmcblk0: error -110 transferring data, sector 4126233, nr 8,
    card status 0xc00
* By removing the dto calculation and setting the timeout value
  to the maximum specified by the SD card specification part A2
  section 2.2.15 these timeouts can be avoided.
* This change has been used by beagleboard users as well as the
  Texas Instruments SDK without a negative impact.
* There are multiple discussion threads about this but the most
  relevant ones are:
    * http://talk.maemo.org/showthread.php?p=1000707#post1000707
    * http://www.mail-archive.com/linux-omap@vger.kernel.org/msg42213.html
* Original proposal for this fix was done by Sukumar Ghoral of
  Texas Instruments
* Tested using a Texas Instruments AM335x EVM

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
fix mali init for samsung jb
cpufreq_lulzactiveq: fix warnings
revert ics hacks
cpufreq: tiny adjustments in the multipliers
exynos_mem: an alternative temporary workaround for exynos-mem security hole

This assumption may be wrong but I guess exynos-mem is meant only for reading from/writing to CMA regions (for camera firmware for example) and limiting the access to those regions may prevent the security hole while not breaking any functionality until Samsung fixes this in a more proper way.

Keep in mind that this modification is only for S2 (i9100) and S3 (i9300). You will have to append dma reservations from exynos_reserve function in the corresponding platform file in /arch/arm/mach-exynos4 folder.
sched: Add missing call to calc_load_exit_idle()

commit 749c8814f08f12baa4a9c2812a7c6ede7d69507d upstream.

Azat Khuzhin reported high loadavg in Linux v3.6

After checking the upstream scheduler code, I found Peter's commit:

  5167e8d5417b sched/nohz: Rewrite and fix load-avg computation -- again

not fully applied, missing the call to calc_load_exit_idle().

After that idle exit in sampling window will always be calculated
to non-idle, and the load will be higher than normal.

This patch adds the missing call to calc_load_exit_idle().

Signed-off-by: Charles Wang <muming.wq@taobao.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1345449754-27130-1-git-send-email-muming.wq@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
pm-hotplug: add tegrak's secondcore support + pm-hotplug enable/disable depending on the selected cpu governor
remove j4fs driver
j4fs driver
block: Adding ROW scheduling algorithm

Signed-off-by: Tatyana Brokhman <tlinder@xxxxxxxxxxxxxx>
block: row-iosched: fix compilation for 3.0 kernels
power: main: powersave mode workaround, by AndreiLux from s3 kernel
i9100p merges