gpu: ion: Add dummy msm_ion header file

The msm specific parts of ion.h are being moved into a new header
file. For now, add a dummy header file to get clients transitioned
over.

Change-Id: Iac039678e1c3f15d87e67aa667f7e9883ca16669
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
msm_fb: display: Fix double entry in clean pipes.

Caused by the double entry of this commit: "e256961d379c264e2fde3665dfd32fe6ce9ce9d9"

Change-Id: I5a1c4ed7b71c8ef2d0ee2e997303df78f37fc7e1
msm8660: fix panic when calculated clock is too high

  * pr_err() in this case was missing an argument which caused printk()
    to dereference a null string.
  * This fixes the hard crash seen when playing a landscape 1080p video
    in portrait orientation or a portrait video in landscape.

Change-Id: I19cf72951d5ce3bd8f321f9f30c39ae9bce3d785
(cherry picked from commit 6cac08d7500d72d70e0daa4ef4e46eed5b32a3a1)
t769: update defconfig

Change-Id: Icdc1f4e140811876cf42fe1065f4f47420714ba5
defconfig: enable uhid for all cm supported devices

Change-Id: If2308495ca51ab5536477d332aa147191adbcfe8
Merge "t769: update defconfig" into next
hercules: update config

Change-Id: I9b76e610402f5ea2c0a4d428418aea31ebed95ca
Merge "msm_fb: display: Fix double entry in clean pipes." into next
quincyatt: update defconfig

Change-Id: I22c57cc38e37e327b3b72e3c3d6c9cb6d08c843d
quincydcm: update defconfig

Change-Id: I0b1eb01cc11da041816127afa8ed7932e961c597
quincytmo: update defconfig

Change-Id: I14384c57ff494f36289a8f40eeadb16c5190186d
msm: mpd: Fix writeback merge conficts.

Resolves conflicts generated by the following commits:
- e256961d379c264e2fde3665dfd32fe6ce9ce9d9
- 3a7b8793f84ad3f79a52674cabb3fc69097970b8

Change-Id: I11871cb59b39b4f5445cb6c58a672fbc85488d9f
Merge remote-tracking branch 'github/next' into cm-11.0
Revert "CPUfreq ondemand: update sampling rate without waiting for next sampling"

This reverts commit 88f038128ea44021c9f0403b2d9bb3f33c8e954a.
Revert "Improve Ondemand"

This reverts commit 6e6fd8f6464588951c825da2746ff18437dacb4d.
Merge branch 'cm-11.0' of github.com:CyanogenMod/android_kernel_samsung_msm8660-common into exp

Conflicts:
	arch/arm/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig
	arch/arm/mach-msm/msm_rq_stats.c
	fs/proc/stat.c
	include/linux/swap.h
	mm/page_io.c
	mm/swapfile.c
Remove badass gov.