uhid: backport from 3.4

Change-Id: Ic48f83f4ed405048ff1e08c04768ed0baefe1caf
i777, i9100, n7000: enable uhid

Change-Id: I890bda6f546c4ef00e55065a8baa3f0b19b6423e
bcmdhd: reenable IPv6, disable multicast in suspend

Change-Id: Ia7a190153e4bd1e12a94b1d42173ffda4dc32899
bcmdhd: disable GAN_LITE_NAT_KEEPALIVE_FILTER

Change-Id: I58dd48984a04dc43e1209574eb54446a558ec210
smdk4210: mali: merge with r3p1 driver from note8

Change-Id: I7b858b3c912779c56b600b15f1db854d7facb4eb
i777, i9100, n7000: enable pegasusq gov

Change-Id: Ic4a77a9664466d196322640ce089400645b7b6d8
block: add row io scheduler

Change-Id: Ifb8c909ff471338f3b7b5894f375d322da9f4c08
mali: fix broken file format

Change-Id: I828edacfac3f5f38b63a0110d3cc26dfc1a41f68
Merge "i777, i9100, n7000: enable pegasusq gov" into cm-10.1
mali: 3-step gpu DVFS control

Change-Id: I8aa50b920c3d8ce0edd2433eae60347a82a4dbba
Merge "mali: 3-step gpu DVFS control" into cm-10.1
Merge "block: add row io scheduler" into cm-10.1
i777, i9100, n7000: enable row io scheduler

Change-Id: I3d1a080efda8af28a61e1e6d535085bcea1cb710
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_kernel_samsung_smdk4210 into kbc-aosp-jb-mr1

Conflicts:
	Documentation/block/row-iosched.txt
	block/Makefile
	block/row-iosched.c
Linux kernel 3.0.71
Linux kernel 3.0.72
Linux kernel 3.0.73
Linux kernel 3.0.74