tree 83ba584487a6a612c8fcf2563c28c0263df35ba2
parent bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd
parent 99bc47067910f7070e65ee318a6dd79a2371f1e5
author Rafael J. Wysocki <rjw@sisk.pl> 1252952765 +0200
committer Rafael J. Wysocki <rjw@sisk.pl> 1252952765 +0200

Merge branch 'master' into for-linus