tree dc4adab63d19507f7ac44855ad9920f8fd2dd2f0
parent e6f25a7b2398581a5f96bf9021d0b22c9647acf4
parent dcd94dbdaff452b95d4ba11fdbf853b5bda8e6e7
author Rafael J. Wysocki <rjw@sisk.pl> 1250631457 +0200
committer Rafael J. Wysocki <rjw@sisk.pl> 1250631457 +0200

Merge branch 'master' into for-linus