author | Praneeth Bajjuri <praneeth@ti.com> | |
Mon, 26 Jan 2015 22:21:33 +0000 (16:21 -0600) | ||
committer | Praneeth Bajjuri <praneeth@ti.com> | |
Mon, 26 Jan 2015 22:21:33 +0000 (16:21 -0600) |
* 'android-3.14' of https://android.googlesource.com/kernel/common:
usb: gadget: check for accessory device before disconnecting HIDs
staging: android: ashmem: add missing include
Change-Id: I72e8fdfeb8a55c036c2f9f3190dfb1dbb5afe675
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
usb: gadget: check for accessory device before disconnecting HIDs
staging: android: ashmem: add missing include
Change-Id: I72e8fdfeb8a55c036c2f9f3190dfb1dbb5afe675
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Trivial merge