summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/include
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-30 20:59:09 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-30 20:59:09 +0100
commitb8bc83971cc20cae3c3b65c26a804f350d74960c (patch)
tree2573e6367e1806c298344fa023bb49a16cc4d1e4 /arch/arm/mach-tegra/include
parent11f0d9311c6e9ed928dc98ce6e9d14c0ee274b05 (diff)
parentbca7ab316edd819edd0e3d59f9ccb26c6b2173f5 (diff)
Merge branch 'pxa/devel' into next/devel2
Conflicts: arch/arm/mach-s3c2416/s3c2416.c
Diffstat (limited to 'arch/arm/mach-tegra/include')
0 files changed, 0 insertions, 0 deletions