summaryrefslogtreecommitdiff
path: root/include/linux/usb.h
diff options
context:
space:
mode:
authorNitin Kumbhar <nkumbhar@nvidia.com>2011-01-28 13:39:17 +0530
committerNitin Kumbhar <nkumbhar@nvidia.com>2011-01-28 13:39:17 +0530
commit8197cb15eaf0640d13c816926f65972ca6cbba84 (patch)
tree17b034f1f03a3d1b7776001cb63bdfd186415130 /include/linux/usb.h
parent7cc7de288765bc634a0374e660de01a3fd4e8e39 (diff)
parent22b3c9ca22924cf7015ecadf7ce111cf402a707b (diff)
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts: arch/arm/mach-tegra/tegra2_dvfs.c Change-Id: I3853d668107c191c94f731256a8d0b63149e8279
Diffstat (limited to 'include/linux/usb.h')
0 files changed, 0 insertions, 0 deletions