Merge branch 'master' into for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 9 Sep 2009 22:02:02 +0000 (00:02 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 9 Sep 2009 22:02:02 +0000 (00:02 +0200)
commitbf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd
treed67f525c76b66956ba7ca0d40bc0fcda0e414700
parent9d7302299ee96ca954fe4ab8ca640333b6e19ad0
parent7135a71b19be1faf48b7148d77844d03bc0717d6
Merge branch 'master' into for-linus