Merge branch 'master' into native-quirk-db
authorVictor Lowther <victor.lowther@gmail.com>
Tue, 1 Dec 2009 04:42:39 +0000 (22:42 -0600)
committerVictor Lowther <victor.lowther@gmail.com>
Tue, 1 Dec 2009 04:42:39 +0000 (22:42 -0600)
commit557b67691b14c580e57cdefbf9faf2852c1e6c77
tree44a7e7e7b4bc74c79c3d24021d89845ebbf523b3
parent8b08ffdb3cf8ecce10309d7149474797832631d2
parentf323e2cf2eddd683721be4eadbdc82f0454e7190
Merge branch 'master' into native-quirk-db

Conflicts:
pm/sleep.d/98smart-kernel-video

98smart-kernel-video no longer exists, but we want the other fixups in the
master branch.
pm/pm-functions.in