apache: Change to correct camera sensor for this phone
misc: uidstat: avoid create_stat() race and blockage.

* create_stat() race would lead to:
  [   58.132324] proc_dir_entry 'uid_stat/10061' already registered

* blocking kmalloc reported by sbranden
 tcp_read_sock()
  uid_stat_tcp_rcv()
    create_stat()
      kmalloc(GFP_KERNEL)

Signed-off-by: JP Abgrall <jpa@google.com>
Fix problems of the squashed update to 3.4.48 kernel version by reverting "mm/pagewalk.c: walk_page_range should avoid VM_PFNMAP areas"

This reverts commit:
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=c8a097fd8d73584d7c1577e0aee41c2a177394f7

The changes made by this commit caused kernel panics while performing
memory operations with subsequent hangs, reboots or shutdowns.
Squashed update of BFQ-v6 to BFQ-v6r1

- Fix use-after-free of queues in __bfq_bfqq_expire(). It may happen that
  a call to bfq_del_bfqq_busy() puts the last reference taken on a queue
  and frees it. Subsequent accesses to that same queue would result in a
  use-after-free. Make sure that a queue that has just been deleted from
  busy is no more touched.
- Use the uninitialized_var() macro when needed. It may happen that a
  variable is initialized in a function that is called by the function
  that defined it. Use the uninitialized_var() macro in these cases.
cpufreq: interactive: handle errors from cpufreq_frequency_table_target

Add checks for error return from cpufreq_frequency_table_target, and be
less noisy on the existing call with an error check.  CPU hotplug and
system shutdown may cause this call to return -EINVAL.

Bug: 8613560
Change-Id: Id78d8829920462c0db1c7e14e717d91740d6cb44
Signed-off-by: Todd Poynor <toddpoynor@google.com>
cpufreq: interactive: reduce chance of zero time delta on load eval

Reschedule load sampling timer after timestamp of sample start taken,
hold spinlock across entire sequence to avoid preemption.  Avoid the
WARN for zero time delta in the load sampling timer function.

Change-Id: Idc10a756f09141decb6df92669521a1ebf0dbc10
Signed-off-by: Todd Poynor <toddpoynor@google.com>
cpufreq: interactive: avoid underflow on active time calculation

Check for idle time delta less than elapsed time delta, avoid
underflow computing active time.

Change-Id: I3e4c6ef1ad794eec49ed379c0c50fa727fd6ad28
Signed-off-by: Minsung Kim <ms925.kim@samsung.com>
Squashed update of kernel from 3.4.48 to 3.4.49
net: wireless: bcmdhd: Disable SUPPORT_PM2_ONLY and DISABLE_FW_ROAM_SUSPEND

Should provide better battery savings.
net: wireless: bcmdhd: Fixed data CRC errors

It is probable that enable the CMD14 in sd bus, creates problems.
In the old version of the driver is used only in the BCM4330 chipset.

dmesg:
<3>[  127.747741] mmc0: Data CRC error
<3>[  127.747863] msmsdcc_data_err: opcode 0x00000035
<3>[  127.747924] msmsdcc_data_err: blksz 4, blocks 1
Squashed update of BFQ-v6r1 to BFQ-v6r2
msm: kgsl: Always resume the GPU regardless of its state

Make sure we resume the GPU regardless of its current
state. If the device is not in suspend state restart the
device and  print an error message.

Change-Id: I9e71cbe27d360dc06513c54f3a734aaea5b10d2b
Signed-off-by: Suman Tatiraju <sumant@codeaurora.org>
cpufreq: interactive: fix race on cpufreq TRANSITION notifier

The cpufreq TRANSTION notifier callback does not check the
governor_enabled state on affected CPUS, which will case
kernel panic in update_load because the policy object maybe
NULL or invalid when governor_enabled is false.

Change-Id: Ie0f1718124f61e2f9b5da57abc6981ada5b83908
Signed-off-by: Lianwei Wang <a22439@motorola.com>
cpufreq: interactive: resched timer if max freq raised

When the policy max freq is raised, and before the timer is
rescheduled in idle callback, the cpu freq may stuck at a
lower freq.

The target_freq shall be updated too, else on a high load
situation, the new_freq is always equal to target_freq and
which will cause freq stuck at a lower freq too.

Reschedule the timer on gov limits callback.

Change-Id: I6c187001ab43e859731429b64f75a74eebc37a24
Signed-off-by: Lianwei Wang <a22439@motorola.com>
ancora: Don't register pmdh device
dpram: Some minor changes from ics-3.0
Squashed update of kernel from 3.4.49 to 3.4.50
set the DEFAULT_GAMMA_LEVEL from 160CD to 20CD
this fixes the high brightness for a sec when turning on the display
video: msm: lcdc_s6e63m0: Corrected an unmanaged gamma for autobrightness

Inside the "s6e63m0_set_elvss" method the management of GAMMA_20CD is missing inside the switch block:
case GAMMA_30CD ... GAMMA_100CD
should be
case GAMMA_20CD ... GAMMA_100CD

Have been corrected also some wrong comments.
input: keyboard: cypress-touchkey: Some changes and code cleanup

- Use only one pointer to cypress_touchkey_devdata, instead of three
- Register the early suspend only when needed (CONFIG_HAS_EARLYSUSPEND)
- Removed unuseful code and commented code
- Code reindented for better readability