]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 35d44b3 1ecdc17)
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)
commit7febb157fdc41c5d3ca5021a4a13598ae35b1916
tree9b98ea464691aa865864033d52e2d123451fbf86tree | snapshot
parent35d44b325b10ba5dc26a2b9a936b6325c390ab45commit | diff
parent1ecdc1740b6edb876159c010ab61dc619861f578commit | diff
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.
MAINTAINERS diff1 | diff2 | blob | history
drivers/acpi/Kconfig diff1 | diff2 | blob | history
drivers/acpi/Makefile diff1 | diff2 | blob | history
Linux Kernel Source Tree.