Detection of configurable touch gestures

Conflicts:
	arch/arm/configs/siyah_defconfig
	drivers/input/touchscreen/mxt224_u1.c
Increased max gestures to 30
Reduced fingers per gesture to 5
gpu boost on touch, hardkeys and touchkeys

Conflicts:
	drivers/input/keyboard/cypress/cypress-touchkey.c
	drivers/input/touchscreen/mxt224_u1.c
Add cpu power
mxt224_u1: fix tsp_threshold sysfs and store the value in platform structure
Fixed rare situation where reading touch gestures would not block until there's a new one reported.
mxt224_u1: Tungstwenty's gesture patches
Revert "mxt224_u1: fix tsp_threshold sysfs and store the value in platform structure"

This reverts commit e3627a0574fe9c6bfedd9301626673bbddeae2e4.
sharpness tweaks from hardcore
mdnie: make mdnie interface work on s2

Conflicts:
	drivers/video/samsung/Kconfig
	drivers/video/samsung/mdniemod.c
Revert "gpu boost on touch, hardkeys and touchkeys"

This reverts commit af1ebebf2ffc046a7cdeccc196d62039d1683a2e.
mdnie: custom settings

Includes hardcore sharpnes fixes, and black gamma curve adjustment for black crush
change hidden directory,update stweaks profile abilities
fix build and cleanup after deleting some unused files
cfg80211: split wext compatibility to separate header

A lot of drivers erroneously use wext constants
and don't notice since cfg80211.h includes them.
Make this more split up so drivers needing wext
compatibility from cfg80211 need to explicitly
include that from cfg80211-wext.h.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net: remove use of ndo_set_multicast_list in drivers

replace it by ndo_set_rx_mode

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net: fix assignment of 0/1 to bool variables.

DaveM said:
   Please, this kind of stuff rots forever and not using bool properly
   drives me crazy.

Joe Perches <joe@perches.com> gave me the spatch script:

	@@
	bool b;
	@@
	-b = 0
	+b = false
	@@
	bool b;
	@@
	-b = 1
	+b = true

I merely installed coccinelle, read the documentation and took credit.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
module_param: make bool parameters really bool (net & drivers/net)

module_param(bool) used to counter-intuitively take an int.  In
fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy
trick.

It's time to remove the int/unsigned int option.  For this version
it'll simply give a warning, but it'll break next kernel version.

(Thanks to Joe Perches for suggesting coccinelle for 0/1 -> true/false).

Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Conflicts:
	net/bluetooth/bnep/core.c
+ testing: Added Brain Fuck Scheduler (BFS) version 0.413 -> ... need more testing!!! -> https://github.com/DerTeufel/samsung-kernel-aries/commit/1dfd958b6c4f1700aaa34aa4753cbf2c12bc3b53 and THX @Ezekeel & @the-devil for the patch ...

Conflicts:
	arch/arm/configs/dorimanx_defconfig
	include/linux/sched.h
+ testing: make ksm scan less often -> https://github.com/DerTeufel/samsung-kernel-aries/commit/e736e9ee9b718f1d0b47e8517fc0396e67b00ff8