diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:32:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:32:01 +0200 |
| commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
| tree | 547fd497a80818a60ac36831377d5df97868173c /include/asm-sparc/psr.h | |
| parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
| download | kernel-crypto-da7878d75b8520c9ae00d27dfbbce546a7bfdfbb.tar.gz kernel-crypto-da7878d75b8520c9ae00d27dfbbce546a7bfdfbb.tar.xz kernel-crypto-da7878d75b8520c9ae00d27dfbbce546a7bfdfbb.zip | |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'include/asm-sparc/psr.h')
| -rw-r--r-- | include/asm-sparc/psr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/psr.h b/include/asm-sparc/psr.h index 213970477a2..b8c0e5f0a66 100644 --- a/include/asm-sparc/psr.h +++ b/include/asm-sparc/psr.h @@ -1,4 +1,4 @@ -/* $Id: psr.h,v 1.15 1997/10/04 08:54:22 ecd Exp $ +/* * psr.h: This file holds the macros for masking off various parts of * the processor status register on the Sparc. This is valid * for Version 8. On the V9 this is renamed to the PSTATE |