diff options
| author | Praneeth Bajjuri <praneeth@ti.com> | 2015-01-26 16:21:33 -0600 |
|---|---|---|
| committer | Praneeth Bajjuri <praneeth@ti.com> | 2015-01-26 16:21:33 -0600 |
| commit | 019062eaf26384ed00cfc9c3b3892368e3adf03d (patch) | |
| tree | 8e8e4e323015ff32ec7c1d89fefc789aef402d46 /include/linux/page-flags.h | |
| parent | c9cd4d2b110fa7285e5302aa0246bbc8a812ce4a (diff) | |
| parent | 32a71bce154cb89a549b9b7d28e8cf03b889d849 (diff) | |
Merge branch 'android-3.14' of https://android.googlesource.com/kernel/common into p-android-3.14
* '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>
Diffstat (limited to 'include/linux/page-flags.h')
0 files changed, 0 insertions, 0 deletions