Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Thu, 24 Feb 2011 19:49:50 +0000 (11:49 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Thu, 24 Feb 2011 19:49:50 +0000 (11:49 -0800)
1  2 
drivers/usb/gadget/android.c

Simple merge