Merge branch 'master' into for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 6 Dec 2009 15:06:11 +0000 (16:06 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Sun, 6 Dec 2009 15:06:11 +0000 (16:06 +0100)

Trivial merge