ion: change ion buffer flags

This syncs up our ion buffer flags in ion.h with upstream (using
ION_FLAG_CACHED instead of CACHED and UNCACHED).
Linux 3.0.67

Change-Id: I6aeb84dec2e97ea8a0cb1254e89db2b8b5df5d5f
Linux 3.0.68

Change-Id: I6eeb3b64ae63a435c4bcbef6667a31df46d5e5ff
Linux 3.0.69

Change-Id: I2e22ba1d15b6462bff12a2f01251cf3c54dc35a6
Linux 3.0.70

Change-Id: Ia700ce3a283ba34fb2a01cf4bf4749db30127c25
Linux 3.0.71

Change-Id: I702f9c2ddc02b9a24118fef8916303936f3f18c9
Linux 3.0.72

Change-Id: I42d2761db6bea5200c410aaf8057b7fe51b1321c

Conflicts:
	mm/memory_hotplug.c
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
Kbuild: copy MSM headers as well

Change-Id: I75d9d6bdf87fcc4baf0b2d330e808e4455f0761f

Conflicts:
	include/linux/Kbuild
	include/media/Kbuild
Linux 3.0.73

Change-Id: Ia112926db53a2053993bf4ef0ff715c8b995c0f9
msm_fb: hdmi: Resolution modes on HDMI

Add a new header file that lists all supported
HDMI resolution modes and the associated timing
information.

CRs-Fixed: 470335
Change-Id: I971422ddb97e3b219cc682032eb67212b434daab
Signed-off-by: Aravind Venkateswaran <aravindh@codeaurora.org>
Signed-off-by: Manoj Rao <manojraj@codeaurora.org>
msm: rotator: sync point support

Add MSM_ROTATOR_IOCTL_BUFFER_SYNC ioctl interface.
Rotator will create a timeline for each session at START, wait for
input fence and create released fence in this ioctl call,
signal the timeline after rotation is done.

Change-Id: I3738f8287d804ccd94e0a16ac0afb8b41b299c75
Signed-off-by: Ken Zhang <kenz@codeaurora.org>

Conflicts:
	drivers/char/msm_rotator.c
Do not copy ion.h
Revert "ion: change ion buffer flags"

This reverts commit ccda56fa69b200c2edebbb04a5811a0161064eef.
Merge branch 'cm-10.1-nardholio-3.0' of https://github.com/TeamApexQ/android_kernel_samsung_apexq into cm-10.1-nardholio-3.0
immvibespi: add sysfs interface for controlling vibe intensity

This is based of codeworkx's work on smdk4412

Useful with something like this:
http://review.cyanogenmod.org/#/c/35981/

Change-Id: I1c1c16b4cefd600ebc6caa603d92044c466cf792
Revert "Do not copy ion.h"

This reverts commit 2889d100cf3313e4c5d00d598a9bbd1e71c58417.
Also changes it to include ion.h only once
Add compress_params.h
Kbuild: add missing compress_params.h header

Change-Id: I4aee23b65145e4c8e7cadcfcc0d912048123c7f3

Conflicts:
	include/sound/Kbuild