Merge branch 'master' into for-linus
commite6f25a7b2398581a5f96bf9021d0b22c9647acf4
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 17 Aug 2009 18:42:36 +0000 (17 20:42 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 17 Aug 2009 18:42:36 +0000 (17 20:42 +0200)
tree32bd69cb2abe9224da7733e14d8ea42eaccca02e
parent3e2bcad89814030ad6a369a97ad1481fd35938d3
parent894ef820b10d77e2d6d717342fc408bdd9825139
Merge branch 'master' into for-linus