Merge branch 'master' into for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 14 Sep 2009 18:26:05 +0000 (20:26 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 14 Sep 2009 18:26:05 +0000 (20:26 +0200)
commitac8d513a6801c8636922ccf4f30211810c9a56ce
tree83ba584487a6a612c8fcf2563c28c0263df35ba2
parentbf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd
parent99bc47067910f7070e65ee318a6dd79a2371f1e5
Merge branch 'master' into for-linus