summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-footbridge/isa-timer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-08 15:58:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-08 15:58:51 -0700
commit06e86849cf4019945a106913adb9ff0abcc01770 (patch)
tree97f041134a043f100398db5bddc4332a469245fa /arch/arm/mach-footbridge/isa-timer.c
parent13e12d14e2dccc7995b8f15a5678a338ab4e6a8c (diff)
parent3b3eca3116861113ccc0e1ca3b98cb43598f46a7 (diff)
downloadlinux-06e86849cf4019945a106913adb9ff0abcc01770.tar.gz
linux-06e86849cf4019945a106913adb9ff0abcc01770.tar.bz2
linux-06e86849cf4019945a106913adb9ff0abcc01770.zip
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / Runtime: Fix loops in pm_runtime_clk_notify() PM / Intel IOMMU: Fix init_iommu_pm_ops() for CONFIG_PM unset
Diffstat (limited to 'arch/arm/mach-footbridge/isa-timer.c')
0 files changed, 0 insertions, 0 deletions