aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tcc8k
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-06-29 07:45:16 -0400
committerTony Lindgren <tony@atomide.com>2011-06-29 07:45:16 -0400
commit48cb1258e8b0f8c81cfb699b42326c5b2147b3f8 (patch)
tree6dc560f24eec8d303534d86b1e20d037df94a68d /arch/arm/mach-tcc8k
parent332acd9e534e0bc8713d2cb90dd2d4d5f2485401 (diff)
parentec3cdb5baedf6bb3852c531426c1e95a13671dff (diff)
Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-cleanup
Conflicts: arch/arm/mach-omap2/pm-debug.c arch/arm/mach-omap2/pm.h
Diffstat (limited to 'arch/arm/mach-tcc8k')
0 files changed, 0 insertions, 0 deletions