Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@woody.osdl.org>
Sat, 2 Dec 2006 16:28:28 +0000 (08:28 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Sat, 2 Dec 2006 16:28:28 +0000 (08:28 -0800)
* 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  Revert "ACPI: SCI interrupt source override"


Trivial merge