ruby: enable USB OTG
adreno: update drivers from CAF

Signed-off-by: helicopter88 <helicopter88@iof303.pnap.ioflood.com>

Conflicts:

	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno_a2xx.c
	drivers/gpu/msm/adreno_pm4types.h
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/gpu/msm/adreno_ringbuffer.h

Change-Id: I073f2438f20660f1384fb3da83d9b18b954b699e
kgsl: update drivers from CAF

Signed-off-by: helicopter88 <helicopter88@iof303.pnap.ioflood.com>

Conflicts:

	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl_cffdump.c
	drivers/gpu/msm/kgsl_device.h
	drivers/gpu/msm/kgsl_drm.c
	drivers/gpu/msm/kgsl_gpummu.h
	drivers/gpu/msm/kgsl_mmu.h

Change-Id: I01f370bb53789a6023715aa16db3d7c4ac8e18c8
remove arch/arm/mach-msm/sio-iosched.c

Conflicts:

	block/sio-iosched.c

Change-Id: Ieb8932ad96a796c94f9d3eac6cb3a7fb95b6b02f
added SIO and V(R) from sultan-kernel-bruce-linaro repo
Revert "Fix up GPU user-configurable OC (2/2)"

This reverts commit e14b3e9b881e2af59c4affcc1a9c90d155a36f4f.
Revert "Fix up CPU OC (2/2)"

This reverts commit bb774b11f0abe8273fec96c774dba94481d471c1.
Build VR IO schedule and allow it to become default
Revert "Revert "ext4: use atomic64_t for the per-flexbg free_clusters count""

This reverts commit cb74805ca092b7e615bf952e9eea985c923b9462.
ext4: fixup 64-bit divides in 3.0-stable backport of upstream fix

Replace C division operators with div64_u64 for divides introduced in:
commit 503f4bdcc078e7abee273a85ce322de81b18a224
ext4: use atomic64_t for the per-flexbg free_clusters count

Specific to the 3.0-stable backport of the upstream patch.

Change-Id: Id10180ed16f54f58fc18531092e88f52fc6de31c
Reviewed-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
NFS: fix printf type compiler warning

Change-Id: I4a7269a2b60dbe05ecd724abb7176c40f3f2baae
Revert "power: fbearlysuspend: add sleep hack for CRT-off animation"

This reverts commit 079a699552e81127fc7ce41bcf1265b661ce632c.