Revert "drivers: touchscreen: Update Himax 825xD touchscreen driver"

This reverts commit e32440a471df6afc89288e4a41acc849c783c287.
Revert "drivers: cm3629: Update CM3629 sensor driver"

This reverts commit d64e6d3edfa51e6a2a8c9b4f5a5e2a83a6c099f5.
Revert "msm: HTC: Add 8226 specific bits"

This reverts commit e3116292f56196d311d4f968e952733595b7a179.
Revert "drivers: tfa9887: Update TFA9887 AMP driver"

This reverts commit 882a28530a680d776871c812fc8079f3fe93c926.
Revert "drivers: leds: Update TPS61310 flashlight driver"

This reverts commit 9427324e08da8f446d05395eed64816d658ea1dd.
writeback: fix occasional slow sync(1)

In case when system contains no dirty pages, wakeup_flusher_threads() will
submit WB_SYNC_NONE writeback for 0 pages so wb_writeback() exits
immediately without doing anything, even though there are dirty inodes in
the system.  Thus sync(1) will write all the dirty inodes from a
WB_SYNC_ALL writeback pass which is slow.

Fix the problem by using get_nr_dirty_pages() in wakeup_flusher_threads()
instead of calculating number of dirty pages manually.  That function also
takes number of dirty inodes into account.

Change-Id: Ic5cf9df3dd552f6d79f4bb8a50df3b111fab1666
Signed-off-by: Jan Kara <jack@suse.cz>
Reported-by: Paul Taysom <taysom@chromium.org>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Squash: kexec support

Add kexec-hardboot changes for htc one m8

"Allows hard booting (i.e., with a full hardware reboot) to a kernel
previously loaded in memory by kexec.  This works around the problem of
soft-booted kernel hangs due to improper device shutdown and/or
reinitialization."
More info in /arch/arm/Kconfig.

Original author: Mike Kasick <mike@kasick.org>

Vojtech Bocek <vbocek@gmail.com>:
  I've ported it to hammerhead, it is based of my mako/grouper port, which is
  based of Asus TF201 patch ported by Jens Andersen <jens.andersen@gmail.com>

  Hammerhead is the first device I've ported this patch to which uses
  device tree binary instead of atags. It is also rather picky - its
  bootloader erases first 128MB of RAM on reboot, so following hacks had
  to be applied:
  * Copy dtb to location passed in r2 before jumping to kexecd' kernel,
    the kernel would just freeze when I left dtb above 128MB of RAM.
  * Copy kexecd' kernel to location in the first 128MB before jumping to it,
    the decompressor operates very slowly if the kernel is above the cached
    area, copying it lower and decompressing it afterwards is much faster.

  Same as my mako/flo patches, the guest kernel does not require any
  modifications, kexec-hardboot is equivalent to standard kexec.

  To support dtb, following commit was backported from the mainline:
    commit 4cabd1d9625c7d88acd143f4021fbef75394f154
    Author: Matthew Leach <matthew.leach@arm.com>
    Date:   Fri Sep 21 18:56:02 2012 +0100

      ARM: 7539/1: kexec: scan for dtb magic in segments

      This patch allows a dtb to be passed to a new kernel using the kexec
      mechinism.

      When loading segments from userspace, scan each segment's first four
      bytes for the dtb magic. If this is found set the kexec_boot_atags
      parameter to the relocate_kernel code to the phyical address of this
      segment.

  and fixes of this commit:
    c564df4db85aac8d1d65a56176a0a25f46138064
    2456f44dd7a9aaffc2cd21a13f78198b3d94da08

ayysir <dresadd09691@gmail.com>:
  kexec: use mem_text_write_kernel_word to set reboot_code_buffer args
  in order to avoid protection faults (writes to read-only
  kernel memory) when CONFIG_STRICT_MEMORY_RWX is enabled.

Signed-off-by: Vojtech Bocek <vbocek@gmail.com>

* Add kexec-hardboot changes for the HTC One m8

* Update defconfig

* Add missing reserve functions and dtb flag

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

Conflicts:
	arch/arm/boot/compressed/head.S

Enable kexec

Change-Id: If0ea7134341324dc190299eb28361da68492d582
Linux 3.4.1
Linux 3.4.2

Change-Id: If38076fe2754868f11e36f56e53fb77acca87b2e
Linux 3.4.3

Change-Id: Ifa15447d6e8728d8d4770e855f69691e87efc4c3
Linux 3.4.4

Change-Id: I4a331aaf25be29cb29cb26c778b8589a0269120a
cpufreq: interactive: delete timers for GOV_START

Make sure that timers cpu_timer and cpu_slack_timer
deactivated before addition of new.

Change-Id: If31c4049606871df6f00efdc24b1d713c86a6f69
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Git-commit: b430123367e78a6557bac3cf1558bcb85193fb12
Git-repo: https://android.googlesource.com/kernel/common/
[mattw@codeaurora.org: resolved trivial context conflict]
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
Remove kexec error if hardboot is not defined

also the useless commented out code

Change-Id: Ib3f13aef049ededb5a008e76d1f6fd6b1c586cd3
Revert "m8: add some of morfic's tweaks"

This reverts commit 3a48e1122ec5e81046520101fe45ac654d350a77.