diff options
| author | Praneeth Bajjuri <praneeth@ti.com> | 2015-01-23 16:56:36 -0600 |
|---|---|---|
| committer | Praneeth Bajjuri <praneeth@ti.com> | 2015-01-23 16:56:36 -0600 |
| commit | d12dce283f6a121a279b86428b4de66ea8050de8 (patch) | |
| tree | 4cb92f80038681dd1a0f6a851d4c0ad42d06fe58 /drivers/media/i2c/smiapp/smiapp-core.c | |
| parent | 308f90bdd0684f5db7d21d21f9caa840a74af231 (diff) | |
| parent | fe0462536e3f940ba5707fc0ce4187b7ad9cd267 (diff) | |
Merge branch 'p-android-3.14' into p-ti-linux-3.14.y-android
* p-android-3.14:
usb: gadget: android: Save/restore ep0 completion function
usb: u_ether: Fix compile errors
usb: gadget: Add Uevent to notify userspace
usb: gadget: configfs: Add usb_function ptr to fi struct
Conflicts:
drivers/usb/gadget/configfs.c
Change-Id: I765a329e9352ff6a5a668acc5a846afb40bda243
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Diffstat (limited to 'drivers/media/i2c/smiapp/smiapp-core.c')
0 files changed, 0 insertions, 0 deletions