tree d67f525c76b66956ba7ca0d40bc0fcda0e414700
parent 9d7302299ee96ca954fe4ab8ca640333b6e19ad0
parent 7135a71b19be1faf48b7148d77844d03bc0717d6
author Rafael J. Wysocki <rjw@sisk.pl> 1252533722 +0200
committer Rafael J. Wysocki <rjw@sisk.pl> 1252533722 +0200

Merge branch 'master' into for-linus