fix merge derp

Change-Id: I65976c869ca627a3288ce74b5ef22511a48e9bd4
defconfig: disable some unneeded debugging, optimize branches

Change-Id: I774032a3b65480b3d3857aa661a5973c88f4d7bb
logger: Add sysfs interface to Enable / Disable Android Logger

- switching done via /sys/kernel/logger_mode interface
default is 0 (off)
Credits to AndiP

Change-Id: I7bf979dadd0ac7155e8a939a8693eef858bfb873
mm: set swappiness to 0

we have about 2gb ram, we dont need swapiness at all

Change-Id: Icc8725e6fa0e269017ef652555993358db8fafec
Async I/O latency to a ssd greatly increased, 34% gain (Creds: kleikamp)

Change-Id: I4a2f5d33db55052103d5dfc21719565197f725f8
Fix governor start/stop race condition (Thanks to Albinoman887)

Change-Id: I4af87f2105cca93f2b1cb2a34a7e16866ea2c884
Fix printing of governor and driver name the correct way (Thanks to Albinoman887)

Change-Id: Ia9770c4774f3794c483b629cba14e69059680d0b
Cifs 4.2.x multiuser fix

Change-Id: I0635a7d00d5f3cdaa2da7db3edafe1e72a20770c
defconfig: disable even more debugging features

Change-Id: I3a5f5f68a12622a0f4fc7c52709f22b0c471772b
cpufreq: enable DVFS again and fix intellidemand build breakage

Change-Id: I8bef2b91813b570878dcc66be3a1555cdc899c09
Linux 3.4.11

Change-Id: I7d3751ae3d0d3d65e683bb0c39874ed18780f865
Linux 3.4.12

Change-Id: I737d18826dc26ad5abd8d8304d895b8160be468b
Linux 3.4.13

Change-Id: Ifa50fc3b5c3ca16f4c5a292c224384d7f34b2a1d
Linux 3.4.14

Change-Id: Iaa5986affa7ea04b214712bfdf5eb12538e5256a
Linux 3.4.15

Change-Id: Iffa9bcfeac9b2b20d25d081a88a678575eaab85a
Linux 3.4.16

Change-Id: Icfdaf21fdbfc468ece5cafdc0368ffa0004db9cd
Linux 3.4.17

Change-Id: Id87136c6a75182f832c5e937af275921511cf1fe
Linux 3.4.18

Change-Id: Iac3c18ecbe9bc3c108cead47a8534445fa4eb807
Linux 3.4.19

Change-Id: I9e57cbc210d7ffdb21839b1dad469f41721c4714
Linux 3.4.20

Change-Id: Ic4ba6b9f10d2b94be205eb2403250552005d80d5