Merge branch 'google' into android-3.18

diff --cc drivers/base/power/main.c
Simple merge

diff --cc drivers/hid/hid-multitouch.c
Simple merge

diff --cc drivers/mmc/card/block.c
Simple merge

diff --cc drivers/staging/android/Kconfig
Simple merge

diff --cc drivers/staging/android/binder.c
Simple merge