diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
| commit | f987e832a9e79d2ce8009a5ea9c7b677624b3b30 (patch) | |
| tree | 0dd09a5e6b4c60ee0a9916907dfc2cda83f3e496 /arch/arm/tools | |
| parent | f737b7f46a72c099cf8ac88baff02fbf61b1a47c (diff) | |
| parent | fc993d9bc48f772133d8cd156c67c296477db070 (diff) | |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
arch/arm/mach-tegra/tegra3_usb_phy.c
arch/arm/mach-tegra/usb_phy.c
drivers/usb/gadget/tegra_udc.c
drivers/usb/otg/Makefile
drivers/video/tegra/fb.c
sound/soc/tegra/tegra_pcm.c
Diffstat (limited to 'arch/arm/tools')
| -rw-r--r-- | arch/arm/tools/mach-types | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index e407a8501f53..8527c6df4548 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types @@ -1116,5 +1116,7 @@ ubisys_p9d_evp MACH_UBISYS_P9D_EVP UBISYS_P9D_EVP 3493 atdgp318 MACH_ATDGP318 ATDGP318 3494 tegra_enterprise MACH_TEGRA_ENTERPRISE TEGRA_ENTERPRISE 3512 p1852 MACH_P1852 P1852 3651 -kai MACH_KAI KAI 3897 +kai MACH_KAI KAI 3897 p852 MACH_P852 P852 3667 +e1853 MACH_E1853 E1853 4241 +tai MACH_TAI TAI 4311 |