git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d5ee26 d91f79e)
Merge branch 'acpi-pad' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Oct 2009 22:03:00 +0000 (15:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Oct 2009 22:03:00 +0000 (15:03 -0700)
* '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.


Trivial merge
Pandora Kernel Repository