chiark / gitweb /
Merge branch 'master' into newacpi
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 3 Jun 2012 14:21:27 +0000 (15:21 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 3 Jun 2012 14:21:27 +0000 (15:21 +0100)
commitaa62ee22238449d01ec04084f6f873553f0b0c87
tree4d2a3d72ba37a3146e77da84a84ce962c1ae6d77
parent51e3ad42cb6d9114fe2fb6b277adb59179e1f835
parent37e52bdb96b9730add76a3183a0fd0f6bbd6acf7
Merge branch 'master' into newacpi