update logo

OBS:includes makefile workaround

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>
add MDSS Specific panel

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>
add MHL SII8620 and SII8061 support

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>
add shinano platform

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>
add MSM Modem Subsystem Restart Monitor

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>
add PN544 NFC driver

driver picked from 14.4.A.0.133 release

Conflicts:
	drivers/misc/Kconfig
	drivers/misc/Makefile
remove CC wrapper
persistent_ram: Fix buffer size clamping during writes

commit 484dd30e016eb425b0de871357fff2c9bb93be45 upstream.

This is a longstanding bug, almost unnoticeable when calling
persistent_ram_write() for small buffers.

But when called for large data buffers, the write routine behaves
incorrectly, as the size may never update: instead of clamping
the size to the maximum buffer size, buffer_size_add_clamp() returns
an error (which is never checked by the write routine, btw).

To fix this, we now use buffer_size_add() that actually clamps the
size to the max value.

Also remove buffer_size_add_clamp(), it is no longer needed.

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Acked-by: Colin Cross <ccross@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Revert "staging: android: ram_console: honor dmesg_restrict"

This reverts commit dd09979346813357200adf71b07003fc0a778089.
spmi: use more appropriate name for spmi devices

Using a pointer for the name makes devices near impossible to access
from sysfs reliably without an alias. Change this to either use the
unique of_node name or the of_node name and the device's address.

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
leds-qpnp: reduce WLED max brightness to 255, as dictated by led-class

Signed-off-by: Courtney Cavin <courtney.cavin@sonymobile.com>

Conflicts:
	drivers/leds/leds-qpnp.c
radio: iris: Mark radio_hci_smd_init as __init

Change-Id: I37aba71dc5fdee00054172ed46a20d93c3e77766
radio: iris: Initialize radio-iris for built-in iris-transport

Change-Id: Id0d9a36f93ec387e08be3d041e60113d2cf75aa8
radio: iris: Use #define to declare numerical constants

* Declaring these as actual types causes duplicate symbol problems
  when compiling IRIS as a kernel builtin.

Change-Id: Id180bc196caaa12d0755a9159af9660419558a56
add rhine platform
Add a common stub config for rhine

* Add stubs CONFIG_MACH_RHINE and
  selected if any of their devices are selected.

Change-Id: I315a9599c8430da18a70ac2154798e5f30089525
Updated dts for honami panel to match mdss driver

Adds configurations that is read by mdss driver to handle
power on and reset of lcd panel.

Conflicts:
	drivers/video/msm/mdss/mdss_dsi_panel_driver.c
	drivers/video/msm/mdss/mdss_mdp.c
Add a common stub config for shinano

* Add stubs CONFIG_MACH_SHINANO,
  selected if any of their devices are selected.
* Much cleaner ifdefs in {clock,board}-8974.c now.

Change-Id: I315a9599c8430da18a70ac2154798e5f30089525

Conflicts:
	arch/arm/mach-msm/Kconfig
update rhine battery to match new layout
dtsi: update to match new mdss

rename
qcom,mdss-dsi-te-v-sync-rd-ptr-irq-line to qcom,mdss-dsi-te-wr-mem-start
qcom,mdss-dsi-te-v-sync-continues-lines to qcom,mdss-dsi-te-wr-mem-continue

according to qcom mdss update

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>