diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-03-07 18:38:30 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-03-07 18:38:30 +0530 |
| commit | 04db8ee9121dbddcccfa5fb0e0e34b9a5028c6c3 (patch) | |
| tree | 2a5e287b5f2b58e98e57406f5f8d1b6f6e6b5a38 /include/linux/console.h | |
| parent | 0355ab1e7e6b3c8bf4ce9414cf0afa00cb4e113f (diff) | |
| parent | 07a84a1ce6dae0bd521ac30c56ffc22f31da10b1 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/include/mach/system.h
arch/arm/mach-tegra/include/mach/usb_phy.h
arch/arm/mach-tegra/usb_phy.c
drivers/usb/host/ehci-tegra.c
drivers/video/tegra/dc/dc.c
drivers/video/tegra/dc/hdmi.c
include/linux/tegra_usb.h
Change-Id: Ic1f4f2b360893e8de6b867a8ecc239aca02367da
Diffstat (limited to 'include/linux/console.h')
0 files changed, 0 insertions, 0 deletions