summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/include/mach/irqs.h
diff options
context:
space:
mode:
authorJin Qian <jqian@nvidia.com>2010-12-29 17:35:51 -0800
committerDan Willemsen <dwillemsen@nvidia.com>2011-04-26 15:48:55 -0700
commit5042cb6656ce34baf449d2d5f2f2890d1ff82e4f (patch)
tree6be29f2c50e813fc40128acd06c0bd523d5eac26 /arch/arm/mach-tegra/include/mach/irqs.h
parent93cd7e592f9ac76c0f2799436a9e46b26b22febe (diff)
Merge remote branch 'git-master/android-tegra-2.6.36' into merge-android
Conflicts: arch/arm/configs/tegra_defconfig arch/arm/mach-tegra/Kconfig arch/arm/mach-tegra/Makefile arch/arm/mach-tegra/board-ventana-power.c arch/arm/mach-tegra/board-ventana-sensors.c arch/arm/mach-tegra/board-ventana.c arch/arm/mach-tegra/clock.c arch/arm/mach-tegra/common.c arch/arm/mach-tegra/cpu-tegra.c arch/arm/mach-tegra/fuse.c arch/arm/mach-tegra/headsmp.S arch/arm/mach-tegra/tegra2_dvfs.c arch/arm/tools/mach-types drivers/rtc/rtc-tegra.c drivers/usb/gadget/fsl_udc_core.c drivers/video/tegra/host/dev.c drivers/video/tegra/host/nvhost_channel.c drivers/video/tegra/host/nvhost_intr.c Original-Change-Id: I1e9b6d0e761cf1e95cf90b78b5932b53fcb9bb5e (cherry picked from commit 2f331e046f7c4cfc6ab54fca3193035b3bf3a14f) Reviewed-on: http://git-master/r/14572 Reviewed-by: Scott Williams <scwilliams@nvidia.com> Tested-by: Scott Williams <scwilliams@nvidia.com> Change-Id: I29db8796b2e27a8d218c332de36f880a7cf4bcb2
Diffstat (limited to 'arch/arm/mach-tegra/include/mach/irqs.h')
0 files changed, 0 insertions, 0 deletions