Revert "mcbsp: remove wken register"

This reverts commit 216559642cfcb408bdc3e4314957f0b2142536a1.
Revert "sound: WIP on MIC function"

This reverts commit 2ec7c1bbf543c3bc84aa6c97f49b6354added347.
sensors: move stk22x7 to input/misc + cleanup

Change-Id: Ifb0fbc11c91cf93d487fd27ee017c707054effb0

Conflicts:
	drivers/i2c/Makefile
rewrite of ambient light sensor

Change-Id: Ife2ab008ba6cc6e2bc19107bd42480276685b962
bma250: moved sysfs entries to i2c device / cleanup

Change-Id: I7b0c60b0e9bc154fd5e239ce15d1d09b1dd9a412
stk_als22x7: attach sysfs to i2c device / minor cleanup

Change-Id: I15beda92c781be267b76794014b5ab157759e6af
stk_als22x7: add max report value of 8192

Change-Id: I1779b9fc682a1894cf8d0f8d5e916a796af447e4
bma250: fix driver for 3.0 kernel

Change-Id: Ib776f979386e8c974b606fe27c3310de14813d4b
stk als22x7: fix driver for 3.0 kernel

Change-Id: I6141ed84501d80716af122d4724ca65e75585050
otters: board cleanup for new sensor drivers

Change-Id: Ia731206124dcbc9060f42187bfebda3799f61724
defconfig: update otter/otter2 configs

Change-Id: I7b28ac39068a46c086488bec615e276f2d315f8f
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1-omap-3.0

Conflicts:
	arch/arm/configs/otter2_android_defconfig