Revert "drivers: omap-serial: hold wakelock when serial uart driver resumes"

This reverts commit 23881b334e8435eb97565c9ba28cab50d66c74e8.
Revert "board-latona: hold wake lock on WiLink awake"

This reverts commit e7d0efa86fbd3401f9dfafd6d4a1e48595bb441c.
Revert "board-latona: BT runtime PM adaptation"

This reverts commit f35f13937ae3654452296d2c60d0e6f127021f7a.
board: latona: hold a wakelock when WiLink chip is awake

The wakelock will be held 5 seconds max, which are enough to let
the userspace handle the serial UART RX data.
netfilter: revert changes required for Android 4.2+

Revert "netfilter: xt_qtaguid: report only uid tags to non-privileged processes"

This reverts commit 0ddb1e6c9ede51b344e4443175a7a63434112a5b.

Revert "netfilter: xt_qtaguid: remove AID_* dependency for access control"

This reverts commit 6de98dc6edb9aaeb3c66f5fc100fb5de26e1e743.

Revert "netfilter: xt_qtaguid: extend iface stat to report protocols"

This reverts commit 3c49975472397c1f6c6148698bc28c58ce7955b7.

Revert "netfilter: xt_qtaguid: Allow tracking loopback"

This reverts commit caf16785bc7a589b95ec08db4739a3dba4dfb505.

Revert "netfilter: qtaguid: rate limit some of the printks"

This reverts commit 6f7467af968e90ddee0645b7509c2a31557d39ed.
OMAP: PM: move dpll2_ck lookup out of omap_pm_dsp_get_opp()

This fixes the following:

WARNING: at /usr/local/src/android/system/kernel/samsung/latona/kernel/mutex.c:198 __mutex_lock_slowpath+0x27c/0x28c()
Modules linked in: wl12xx_sdio wl12xx mac80211 cfg80211 compat
[<c00497f8>] (unwind_backtrace+0x0/0xf8) from [<c007db1c>] (warn_slowpath_common+0x4c/0x64)
[<c007db1c>] (warn_slowpath_common+0x4c/0x64) from [<c007db50>] (warn_slowpath_null+0x1c/0x24)
[<c007db50>] (warn_slowpath_null+0x1c/0x24) from [<c0573750>] (__mutex_lock_slowpath+0x27c/0x28c)
[<c0573750>] (__mutex_lock_slowpath+0x27c/0x28c) from [<c057376c>] (mutex_lock+0xc/0x24)
[<c057376c>] (mutex_lock+0xc/0x24) from [<c03e4fd8>] (clk_get_sys+0x1c/0xe0)
[<c03e4fd8>] (clk_get_sys+0x1c/0xe0) from [<c006efbc>] (omap_pm_dsp_get_opp+0x70/0xe4)
[<c006efbc>] (omap_pm_dsp_get_opp+0x70/0xe4) from [<c03cee34>] (sm_interrupt_dsp+0x7c/0x168)
[<c03cee34>] (sm_interrupt_dsp+0x7c/0x168) from [<c03caf9c>] (io_dpc+0x450/0x7a4)
[<c03caf9c>] (io_dpc+0x450/0x7a4) from [<c0083684>] (tasklet_action+0x6c/0x150)
[<c0083684>] (tasklet_action+0x6c/0x150) from [<c0084264>] (__do_softirq+0x9c/0x260)
[<c0084264>] (__do_softirq+0x9c/0x260) from [<c00844e0>] (run_ksoftirqd+0xb8/0x184)
[<c00844e0>] (run_ksoftirqd+0xb8/0x184) from [<c009bc7c>] (kthread+0x80/0x88)
[<c009bc7c>] (kthread+0x80/0x88) from [<c00455dc>] (kernel_thread_exit+0x0/0x8)
OMAP: PM: change DSP rate only when required

This should prevent the following to some extent:

WARNING: at /usr/local/src/android/system/kernel/samsung/latona/kernel/mutex.c:198 __mutex_lock_slowpath+0x27c/0x28c()
Modules linked in: wl12xx mac80211 cfg80211 compat [last unloaded: wl12xx_sdio]
[<c00497f8>] (unwind_backtrace+0x0/0xf8) from [<c007dae8>] (warn_slowpath_common+0x4c/0x64)
[<c007dae8>] (warn_slowpath_common+0x4c/0x64) from [<c007db1c>] (warn_slowpath_null+0x1c/0x24)
[<c007db1c>] (warn_slowpath_null+0x1c/0x24) from [<c0573710>] (__mutex_lock_slowpath+0x27c/0x28c)
[<c0573710>] (__mutex_lock_slowpath+0x27c/0x28c) from [<c057372c>] (mutex_lock+0xc/0x24)
[<c057372c>] (mutex_lock+0xc/0x24) from [<c005c6ec>] (omap_device_scale+0x44/0x6f0)
[<c005c6ec>] (omap_device_scale+0x44/0x6f0) from [<c03cee90>] (sm_interrupt_dsp+0x118/0x168)
[<c03cee90>] (sm_interrupt_dsp+0x118/0x168) from [<c03cb0f4>] (io_dpc+0x5e8/0x7a4)
[<c03cb0f4>] (io_dpc+0x5e8/0x7a4) from [<c0083650>] (tasklet_action+0x6c/0x150)
[<c0083650>] (tasklet_action+0x6c/0x150) from [<c0084230>] (__do_softirq+0x9c/0x260)
[<c0084230>] (__do_softirq+0x9c/0x260) from [<c00844ac>] (run_ksoftirqd+0xb8/0x184)
[<c00844ac>] (run_ksoftirqd+0xb8/0x184) from [<c009bc48>] (kthread+0x80/0x88)
[<c009bc48>] (kthread+0x80/0x88) from [<c00455dc>] (kernel_thread_exit+0x0/0x8)
defconfig: reduce vram for latona

We are using only 1 framebuffer and no HDMI. Hence the least
VRAM we would need is 4 MB.
board-latona-display: remove OCP interconnect constraints

L3 OPP1 is disabled, there's no need to specify constraints.
board-latona-display: code cleanup

Remove useless function, declare init_clk_disable as static and
fix code indentation.
Merge branch 'latona-3.0' of git://github.com/sconosciuto/android_kernel_samsung_latona into cm-11.0

Signed-off-by: David Rodero <david@codiguiel.net>

Conflicts:
	arch/arm/mach-omap2/board-latona-display.c

Change-Id: I3fa1713611b2c64815e4181405f30694585aa0b7
Revert "netfilter: revert changes required for Android 4.2+"

This reverts commit 4b8ca79f8ce4fd8c8d1becb31b3815cd5bb51fbb.

Signed-off-by: David Rodero <david@codiguiel.net>
Merge branch 'cm-11.0' into latona-3.0.y