OSDN Git Service

Merge branch 'google' into android-3.18
authorChih-Wei Huang <cwhuang@linux.org.tw>
Sun, 28 Dec 2014 18:36:05 +0000 (02:36 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Sun, 28 Dec 2014 18:36:05 +0000 (02:36 +0800)
commitf04ef3ac743d37a9ddf21e7677ce51f6e0bffbc9
treeb3527609872b043d94ce9d117d496fd2e71badf9
parente6f805294065e36ce0b291f47031f9be696c1f1a
parente20c177146bb346eb3bb26fe69b6c6d24c58d8b7
Merge branch 'google' into android-3.18
drivers/base/power/main.c
drivers/hid/hid-multitouch.c
drivers/mmc/card/block.c
drivers/staging/android/Kconfig
drivers/staging/android/binder.c