Merge commit 'v2.6.30-rc1' into perfcounters/core

Conflicts:
	arch/powerpc/include/asm/systbl.h
	arch/powerpc/include/asm/unistd.h
	include/linux/init_task.h

Merge reason: the conflicts are non-trivial: PowerPC placement
              of sys_perf_counter_open has to be mixed with the
	      new preadv/pwrite syscalls.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 2cd471f92fe6..feff792ed0f9 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -677,11 +677,13 @@ unsigned int irq_create_mapping(struct irq_host *host,
                         return NO_IRQ;
                 }
         }
-        pr_debug("irq: -> obtained virq %d\n", virq);
 
         if (irq_setup_virq(host, virq, hwirq))
                 return NO_IRQ;
 
+        printk(KERN_DEBUG "irq: irq %lu on host %s mapped to virtual irq %u\n",
+                hwirq, host->of_node ? host->of_node->full_name : "null", virq);
+
         return virq;
 }
 EXPORT_SYMBOL_GPL(irq_create_mapping);