tree 9b98ea464691aa865864033d52e2d123451fbf86
parent 6d5ee265c80a551726c49cc4e62663808a300af8
parent d91f79ebc3191b15dbe385925af4840f4e68df77
author Linus Torvalds <torvalds@linux-foundation.org> 1254693780 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1254693780 -0700

Merge branch 'acpi-pad' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'acpi-pad' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  acpi_pad: build only on X86
  ACPI: create Processor Aggregator Device driver

Fixup trivial conflicts in MAINTAINERS file.