Push changelog to correct branch
Merge branch 'JBX_EDISON' into EDISON_WORKING
Merge branch 'JBX_EDISON' into EDISON_WORKING
fixed a damn typo
Disable some options - was breaking kernel
Final config for now
Merge branch 'JBX_EDISON' into EDISON_WORKING
Added todays changelog
EMU_UART: clean up

Change-Id: I919e201b52c49b317d78e0a8efcaa2bbb24b80bd
HWMOD: Correct entries, enable sidle for uart1/3 only
Revert "ALSA: hda - bug fix on return value when getting HDMI ELD info"

This reverts commit 63968d8547504a2922455627b1e85dc64d29050c.
Revert "timer: optimize apply_slack()"

This reverts commit c94b1dd835bb0684f8e52d8649f2fb605e474d99.
Revert "Revert "OMAP4: PM: cold reset: wrong value is used to set LOGICRETSTATE""

This reverts commit 1ec4b075969959cb52fd97edca4321a9ef19c3d3.
Revert "Enable samepage merging and zache"

This reverts commit f4f9e5f10f3e6511db51c894bd56c3f62177504d.
Revert "Revert "Revert "unlzo: fix input buffer free"""

This reverts commit 0b346bc4c106bf63b02741da9fbe67d935398959.
Revert "mutex: restrict mutex spinning to only one task per mutex"

This reverts commit 5e990168fa14c3dd74acc17d99b08dc47a52e149.
Revert "Revert "Revert "percpu_counter: Set protection to spinlock"""

This reverts commit b3ea50291bef9ef101b93dc2cb9863ab72dd4a55.
Revert "I2C: OMAP: Fix the crash in i2c remove"

This reverts commit 1bd6928eb965c47ba00269ed257a65bd1597226d.
Revert "mutex: dynamically disable mutex spinning at high load"

This reverts commit 2e6cf1e99882444710a869d91c31725ad9d0abec.
Revert "timer: hrtimer: Don't check idle_cpu() before calling get_nohz_timer"

This reverts commit bc0994625034d05e483586524f959b12600cb2b7.