xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 3.6-rc6 into usb-next

Browse Source 
This resolves the merge problems with:
	drivers/usb/dwc3/gadget.c
	drivers/usb/musb/tusb6010.c
that had been seen in linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2012-09-16 20:42:46 -07:00
parent 67e6da7027 5698bd757d
commit 2bcb132c69
718 changed files with 5980 additions and 3407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-omap2/board-omap3evm.c
View File

@@ -59,6 +59,7 @@
#include "hsmmc.h"
#include "common-board-devices.h"
#define OMAP3_EVM_TS_GPIO 175
#define OMAP3_EVM_EHCI_VBUS 22
#define OMAP3_EVM_EHCI_SELECT 61