diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 16:10:12 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 16:10:12 -0400 |
commit | af7a535688a758d15f06a98833e6a143b29af9de (patch) | |
tree | bac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/arm/mach-msm/idle.S | |
parent | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (diff) | |
parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) |
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
Diffstat (limited to 'arch/arm/mach-msm/idle.S')
-rw-r--r-- | arch/arm/mach-msm/idle.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/idle.S b/arch/arm/mach-msm/idle.S index 2b1cb7f16943..6a94f0527137 100644 --- a/arch/arm/mach-msm/idle.S +++ b/arch/arm/mach-msm/idle.S | |||
@@ -1,4 +1,4 @@ | |||
1 | /* linux/include/asm-arm/arch-msm/idle.S | 1 | /* arch/arm/mach-msm/include/mach/idle.S |
2 | * | 2 | * |
3 | * Idle processing for MSM7K - work around bugs with SWFI. | 3 | * Idle processing for MSM7K - work around bugs with SWFI. |
4 | * | 4 | * |