diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:17:01 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:17:01 +1100 |
| commit | 9f72a3a19c1ca629d80c5ddc7eae2e1cb4bd1dcb (patch) | |
| tree | 6522c1e900bf2d02d0a08fa5fc00e3ec9b4482f7 /arch/ia64 | |
| parent | c47a63ccb4637bf4e01733e85ecdc269f5d3e76e (diff) | |
| parent | ddf12286951aee1e7763112cf26629de3fabe6ae (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
MAINTAINERS
fs/eventpoll.c
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/perfmon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/perfmon.h b/arch/ia64/include/asm/perfmon.h index 7f3333dd00e4..d551183fee90 100644 --- a/arch/ia64/include/asm/perfmon.h +++ b/arch/ia64/include/asm/perfmon.h @@ -7,7 +7,7 @@ #define _ASM_IA64_PERFMON_H /* - * perfmon comamnds supported on all CPU models + * perfmon commands supported on all CPU models */ #define PFM_WRITE_PMCS 0x01 #define PFM_WRITE_PMDS 0x02 |