]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 30 Mar 2007 18:49:37 +0000 (11:49 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 30 Mar 2007 18:49:37 +0000 (11:49 -0700)
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  Revert "ACPI: parse 2nd MADT by default"


Trivial merge