diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-30 11:49:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-30 11:49:37 -0700 |
| commit | a5bd1786fb30abe663b904f6d79bba413e9ba883 (patch) | |
| tree | d184021d1e81faed3a61be3a780f3c06c50b70d7 /include/pcmcia/version.h | |
| parent | 964429252a88cbb4eccd9f024a00813e10d16c71 (diff) | |
| parent | 4e381a4f06e3c7b350b55a2636b9d45691780eba (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/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"
Diffstat (limited to 'include/pcmcia/version.h')
0 files changed, 0 insertions, 0 deletions