Merge commit 'v2.6.27-rc5' into tip/oprofile

Conflicts: arch/x86/oprofile/nmi_int.c
2026-09-26 18:16:26 +00:00 · 2008-09-24 11:25:31 +02:00 · 2008-09-24 11:25:31 +02:00 · f78e80209c
commit f78e80209c
parent 4c168eaf7e 24342c34a0
1143 changed files with 89780 additions and 67769 deletions
--- a/include/asm-blackfin/.gitignore
+++ b/include/asm-blackfin/.gitignore
--- a/include/asm-blackfin/Kbuild
+++ b/include/asm-blackfin/Kbuild
--- a/include/asm-blackfin/a.out.h
+++ b/include/asm-blackfin/a.out.h
--- a/include/asm-blackfin/atomic.h
+++ b/include/asm-blackfin/atomic.h
--- a/include/asm-blackfin/auxvec.h
+++ b/include/asm-blackfin/auxvec.h
--- a/include/asm-blackfin/bfin-global.h
+++ b/include/asm-blackfin/bfin-global.h
--- a/include/asm-blackfin/bfin5xx_spi.h
+++ b/include/asm-blackfin/bfin5xx_spi.h
--- a/include/asm-blackfin/bfin_simple_timer.h
+++ b/include/asm-blackfin/bfin_simple_timer.h
--- a/include/asm-blackfin/bfin_sport.h
+++ b/include/asm-blackfin/bfin_sport.h
--- a/include/asm-blackfin/bitops.h
+++ b/include/asm-blackfin/bitops.h
--- a/include/asm-blackfin/blackfin.h
+++ b/include/asm-blackfin/blackfin.h
--- a/include/asm-blackfin/bug.h
+++ b/include/asm-blackfin/bug.h
--- a/include/asm-blackfin/bugs.h
+++ b/include/asm-blackfin/bugs.h
--- a/include/asm-blackfin/byteorder.h
+++ b/include/asm-blackfin/byteorder.h
--- a/include/asm-blackfin/cache.h
+++ b/include/asm-blackfin/cache.h
--- a/include/asm-blackfin/cacheflush.h
+++ b/include/asm-blackfin/cacheflush.h
--- a/include/asm-blackfin/checksum.h
+++ b/include/asm-blackfin/checksum.h
--- a/include/asm-blackfin/cplb-mpu.h
+++ b/include/asm-blackfin/cplb-mpu.h
--- a/include/asm-blackfin/cplb.h
+++ b/include/asm-blackfin/cplb.h
--- a/include/asm-blackfin/cplbinit.h
+++ b/include/asm-blackfin/cplbinit.h
--- a/include/asm-blackfin/cpumask.h
+++ b/include/asm-blackfin/cpumask.h
--- a/include/asm-blackfin/cputime.h
+++ b/include/asm-blackfin/cputime.h
--- a/include/asm-blackfin/current.h
+++ b/include/asm-blackfin/current.h
--- a/include/asm-blackfin/delay.h
+++ b/include/asm-blackfin/delay.h
--- a/include/asm-blackfin/device.h
+++ b/include/asm-blackfin/device.h
--- a/include/asm-blackfin/div64.h
+++ b/include/asm-blackfin/div64.h
--- a/include/asm-blackfin/dma-mapping.h
+++ b/include/asm-blackfin/dma-mapping.h
--- a/include/asm-blackfin/dma.h
+++ b/include/asm-blackfin/dma.h
--- a/include/asm-blackfin/dpmc.h
+++ b/include/asm-blackfin/dpmc.h
--- a/include/asm-blackfin/early_printk.h
+++ b/include/asm-blackfin/early_printk.h
--- a/include/asm-blackfin/elf.h
+++ b/include/asm-blackfin/elf.h
--- a/include/asm-blackfin/emergency-restart.h
+++ b/include/asm-blackfin/emergency-restart.h
--- a/include/asm-blackfin/entry.h
+++ b/include/asm-blackfin/entry.h
--- a/include/asm-blackfin/errno.h
+++ b/include/asm-blackfin/errno.h
--- a/include/asm-blackfin/fb.h
+++ b/include/asm-blackfin/fb.h
--- a/include/asm-blackfin/fcntl.h
+++ b/include/asm-blackfin/fcntl.h
--- a/include/asm-blackfin/fixed_code.h
+++ b/include/asm-blackfin/fixed_code.h
--- a/include/asm-blackfin/flat.h
+++ b/include/asm-blackfin/flat.h
--- a/include/asm-blackfin/futex.h
+++ b/include/asm-blackfin/futex.h
--- a/include/asm-blackfin/gpio.h
+++ b/include/asm-blackfin/gpio.h
--- a/include/asm-blackfin/gptimers.h
+++ b/include/asm-blackfin/gptimers.h
--- a/include/asm-blackfin/hardirq.h
+++ b/include/asm-blackfin/hardirq.h
--- a/include/asm-blackfin/hw_irq.h
+++ b/include/asm-blackfin/hw_irq.h
--- a/include/asm-blackfin/io.h
+++ b/include/asm-blackfin/io.h
--- a/include/asm-blackfin/ioctl.h
+++ b/include/asm-blackfin/ioctl.h
--- a/include/asm-blackfin/ioctls.h
+++ b/include/asm-blackfin/ioctls.h
--- a/include/asm-blackfin/ipcbuf.h
+++ b/include/asm-blackfin/ipcbuf.h
--- a/include/asm-blackfin/irq.h
+++ b/include/asm-blackfin/irq.h
--- a/include/asm-blackfin/irq_handler.h
+++ b/include/asm-blackfin/irq_handler.h
--- a/include/asm-blackfin/irq_regs.h
+++ b/include/asm-blackfin/irq_regs.h
--- a/include/asm-blackfin/kdebug.h
+++ b/include/asm-blackfin/kdebug.h
--- a/include/asm-blackfin/kgdb.h
+++ b/include/asm-blackfin/kgdb.h
--- a/include/asm-blackfin/kmap_types.h
+++ b/include/asm-blackfin/kmap_types.h
--- a/include/asm-blackfin/l1layout.h
+++ b/include/asm-blackfin/l1layout.h
--- a/include/asm-blackfin/linkage.h
+++ b/include/asm-blackfin/linkage.h
--- a/include/asm-blackfin/local.h
+++ b/include/asm-blackfin/local.h
--- a/include/asm-blackfin/mach-bf527/anomaly.h
+++ b/include/asm-blackfin/mach-bf527/anomaly.h
--- a/include/asm-blackfin/mach-bf527/bf527.h
+++ b/include/asm-blackfin/mach-bf527/bf527.h
--- a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf527/bfin_sir.h
+++ b/include/asm-blackfin/mach-bf527/bfin_sir.h
--- a/include/asm-blackfin/mach-bf527/blackfin.h
+++ b/include/asm-blackfin/mach-bf527/blackfin.h
--- a/include/asm-blackfin/mach-bf527/cdefBF522.h
+++ b/include/asm-blackfin/mach-bf527/cdefBF522.h
--- a/include/asm-blackfin/mach-bf527/cdefBF525.h
+++ b/include/asm-blackfin/mach-bf527/cdefBF525.h
--- a/include/asm-blackfin/mach-bf527/cdefBF527.h
+++ b/include/asm-blackfin/mach-bf527/cdefBF527.h
--- a/include/asm-blackfin/mach-bf527/cdefBF52x_base.h
+++ b/include/asm-blackfin/mach-bf527/cdefBF52x_base.h
--- a/include/asm-blackfin/mach-bf527/defBF522.h
+++ b/include/asm-blackfin/mach-bf527/defBF522.h
--- a/include/asm-blackfin/mach-bf527/defBF525.h
+++ b/include/asm-blackfin/mach-bf527/defBF525.h
--- a/include/asm-blackfin/mach-bf527/defBF527.h
+++ b/include/asm-blackfin/mach-bf527/defBF527.h
--- a/include/asm-blackfin/mach-bf527/defBF52x_base.h
+++ b/include/asm-blackfin/mach-bf527/defBF52x_base.h
--- a/include/asm-blackfin/mach-bf527/dma.h
+++ b/include/asm-blackfin/mach-bf527/dma.h
--- a/include/asm-blackfin/mach-bf527/irq.h
+++ b/include/asm-blackfin/mach-bf527/irq.h
--- a/include/asm-blackfin/mach-bf527/mem_init.h
+++ b/include/asm-blackfin/mach-bf527/mem_init.h
--- a/include/asm-blackfin/mach-bf527/mem_map.h
+++ b/include/asm-blackfin/mach-bf527/mem_map.h
--- a/include/asm-blackfin/mach-bf527/portmux.h
+++ b/include/asm-blackfin/mach-bf527/portmux.h
--- a/include/asm-blackfin/mach-bf533/anomaly.h
+++ b/include/asm-blackfin/mach-bf533/anomaly.h
--- a/include/asm-blackfin/mach-bf533/bf533.h
+++ b/include/asm-blackfin/mach-bf533/bf533.h
--- a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf533/bfin_sir.h
+++ b/include/asm-blackfin/mach-bf533/bfin_sir.h
--- a/include/asm-blackfin/mach-bf533/blackfin.h
+++ b/include/asm-blackfin/mach-bf533/blackfin.h
--- a/include/asm-blackfin/mach-bf533/cdefBF532.h
+++ b/include/asm-blackfin/mach-bf533/cdefBF532.h
--- a/include/asm-blackfin/mach-bf533/defBF532.h
+++ b/include/asm-blackfin/mach-bf533/defBF532.h
--- a/include/asm-blackfin/mach-bf533/dma.h
+++ b/include/asm-blackfin/mach-bf533/dma.h
--- a/include/asm-blackfin/mach-bf533/irq.h
+++ b/include/asm-blackfin/mach-bf533/irq.h
--- a/include/asm-blackfin/mach-bf533/mem_init.h
+++ b/include/asm-blackfin/mach-bf533/mem_init.h
--- a/include/asm-blackfin/mach-bf533/mem_map.h
+++ b/include/asm-blackfin/mach-bf533/mem_map.h
--- a/include/asm-blackfin/mach-bf533/portmux.h
+++ b/include/asm-blackfin/mach-bf533/portmux.h
--- a/include/asm-blackfin/mach-bf537/anomaly.h
+++ b/include/asm-blackfin/mach-bf537/anomaly.h
--- a/include/asm-blackfin/mach-bf537/bf537.h
+++ b/include/asm-blackfin/mach-bf537/bf537.h
--- a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf537/bfin_sir.h
+++ b/include/asm-blackfin/mach-bf537/bfin_sir.h
--- a/include/asm-blackfin/mach-bf537/blackfin.h
+++ b/include/asm-blackfin/mach-bf537/blackfin.h
--- a/include/asm-blackfin/mach-bf537/cdefBF534.h
+++ b/include/asm-blackfin/mach-bf537/cdefBF534.h
--- a/include/asm-blackfin/mach-bf537/cdefBF537.h
+++ b/include/asm-blackfin/mach-bf537/cdefBF537.h
--- a/include/asm-blackfin/mach-bf537/defBF534.h
+++ b/include/asm-blackfin/mach-bf537/defBF534.h
--- a/include/asm-blackfin/mach-bf537/defBF537.h
+++ b/include/asm-blackfin/mach-bf537/defBF537.h
--- a/include/asm-blackfin/mach-bf537/dma.h
+++ b/include/asm-blackfin/mach-bf537/dma.h
--- a/include/asm-blackfin/mach-bf537/irq.h
+++ b/include/asm-blackfin/mach-bf537/irq.h
--- a/include/asm-blackfin/mach-bf537/mem_init.h
+++ b/include/asm-blackfin/mach-bf537/mem_init.h
--- a/include/asm-blackfin/mach-bf537/mem_map.h
+++ b/include/asm-blackfin/mach-bf537/mem_map.h
--- a/include/asm-blackfin/mach-bf537/portmux.h
+++ b/include/asm-blackfin/mach-bf537/portmux.h
--- a/Show more
+++ b/Show more