| author | Praneeth Bajjuri <praneeth@ti.com> | |
| Fri, 23 Jan 2015 22:44:03 +0000 (16:44 -0600) | ||
| committer | Praneeth Bajjuri <praneeth@ti.com> | |
| Fri, 23 Jan 2015 22:44:03 +0000 (16:44 -0600) | ||
| commit | fe0462536e3f940ba5707fc0ce4187b7ad9cd267 | |
| tree | 6724a9fb3285ef3b0693777816dea06702034da1 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 31a731c69856faa4d5d641a473820f81a865aeed | commit | diff |
| parent | c3d897ccc0f3f0ba7baec111910e52645e6d501f | commit | 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: 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
Change-Id: I98f4e07b3b0393cdd966939b07264605d2cf6701
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
* 'android-3.14' of https://android.googlesource.com/kernel/common:
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
Change-Id: I98f4e07b3b0393cdd966939b07264605d2cf6701
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>