diff options
| author | Praneeth Bajjuri <praneeth@ti.com> | 2015-01-26 16:23:33 -0600 |
|---|---|---|
| committer | Praneeth Bajjuri <praneeth@ti.com> | 2015-01-26 16:23:33 -0600 |
| commit | c73470c1da26dc543452fbff16a02beb62fec938 (patch) | |
| tree | 91a0b8d6a409483ede8a7bd456ccc64f5350164e /include/linux/page-flags.h | |
| parent | d12dce283f6a121a279b86428b4de66ea8050de8 (diff) | |
| parent | 019062eaf26384ed00cfc9c3b3892368e3adf03d (diff) | |
Merge branch 'p-android-3.14' into p-ti-linux-3.14.y-android
* p-android-3.14:
input: evdev: Remove un-necessary free in evdev_release
usb: gadget: check for accessory device before disconnecting HIDs
staging: android: ashmem: add missing include
Change-Id: I71fe0ca013fcc38a08fcaa30f2aa13dc78c8b50f
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Diffstat (limited to 'include/linux/page-flags.h')
0 files changed, 0 insertions, 0 deletions