projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit5e5027bd26ed4df735d29e66cd5c1c9b5959a587
tree9b98ea464691aa865864033d52e2d123451fbf86tree | snapshot
parent6d5ee265c80a551726c49cc4e62663808a300af8commit | diff
parentd91f79ebc3191b15dbe385925af4840f4e68df77commit | diff
Merge branch 'acpi-pad' of git://git./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.
MAINTAINERS diff1 | diff2 | blob | history
drivers/acpi/Kconfig diff1 | diff2 | blob | history
drivers/acpi/Makefile diff1 | diff2 | blob | history
Domain: System / Kernel;