tree 5766bcfbfd7b24816b54298b8ef34054f8cf0fae
parent 2e6713c7662cc5ebc7346b033c404cb2f708fd51
parent 90bc1a658a53f8832ee799685703977a450e5af9
author Rafael J. Wysocki <rjw@sisk.pl> 1249509414 +0200
committer Rafael J. Wysocki <rjw@sisk.pl> 1249509414 +0200

Merge branch 'master' into for-linus