diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-05-24 03:42:19 +0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-24 03:42:19 +0400 |
| commit | ee0736627d3347be0be2769fa7b26431f9726c9d (patch) | |
| tree | 203e2204daaec4cf005463fdf2c7bf380d6eef36 /arch/mips/cavium-octeon/octeon-irq.c | |
| parent | cf9972a921470b0a2da7906104bcd540b20e33bf (diff) | |
| parent | 0af48f42df15b97080b450d24219dd95db7b929a (diff) | |
| download | linux-ee0736627d3347be0be2769fa7b26431f9726c9d.tar.xz | |
Merge branch 'x86/urgent' into x86/setup
Resolved conflicts:
arch/x86/boot/memory.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/mips/cavium-octeon/octeon-irq.c')
0 files changed, 0 insertions, 0 deletions