diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 19:33:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 19:33:48 +0200 |
| commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
| tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /include/asm-sparc64/hw_irq.h | |
| parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
| download | linux-stable-15dd859cacf312f606f54502d1f66537a1e5c78c.tar.gz linux-stable-15dd859cacf312f606f54502d1f66537a1e5c78c.tar.bz2 linux-stable-15dd859cacf312f606f54502d1f66537a1e5c78c.zip | |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-sparc64/hw_irq.h')
| -rw-r--r-- | include/asm-sparc64/hw_irq.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc64/hw_irq.h b/include/asm-sparc64/hw_irq.h deleted file mode 100644 index 16920a291f51..000000000000 --- a/include/asm-sparc64/hw_irq.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/hw_irq.h> |