linux-next: manual merge of the akpm tree with the tree

From: Stephen Rothwell
Date: Thu May 10 2012 - 04:41:57 EST

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/x86/kernel/apic/io_apic.c between commit d1ecad6eee86 ("x86/apic:
Only compile local function if used with !CONFIG_GENERIC_PENDING_IRQ")
from the tip tree and commit "arch/x86/kernel/apic/io_apic.c: move
io_apic_level_ack_pending() inside CONFIG_GENERIC_PENDING_IRQ" from the
akpm tree.

These are the same patch with different commit messages and authors. I
dropped the one from the akpm tree.

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature