linux-next: manual merge of the acpi tree

Hi Len,

Today's linux-next merge of the acpi tree got a trivial conflict in
drivers/acpi/sleep/main.c between commit
d8f3de0d2412bb91639cfefc5b3c79dbf3812212 ("Suspend-related patches for
2.6.27") from the pci tree and commit
4fe0a2f25ed36949330dbda0154a4a701f310462 ("ACPICA: Lindent") from the
acpi tree.

The latter was just updating some code that the former removed.

A general comment on Lindent: it is worth checking the output.  Both the
conflicts were because it removed the space from in front of a '?'
operator - which I consider fairly bogus.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/