commit | 53eb2fbeb9e68e1a9a23945de8450999c46270ce | [log] [tgz] |
---|---|---|
author | Jesse Barnes <jbarnes@hobbes.lan> | Thu Jun 12 12:06:58 2008 -0700 |
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | Thu Jun 12 12:06:58 2008 -0700 |
tree | 3c50f8690f63b53b3cffbcc226cbbe3c8c6de753 | |
parent | 8344b568f5bdc7ee1bba909de3294c6348c36056 [diff] | |
parent | 0e6859d49ff194e01afc229c996e3aefca1a0539 [diff] |
Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 into linux-next