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)
commita5bd1786fb30abe663b904f6d79bba413e9ba883
treed184021d1e81faed3a61be3a780f3c06c50b70d7
parent964429252a88cbb4eccd9f024a00813e10d16c71
parent4e381a4f06e3c7b350b55a2636b9d45691780eba
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  Revert "ACPI: parse 2nd MADT by default"