Merge branch 'master' into for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 10 Aug 2009 21:40:50 +0000 (23:40 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 10 Aug 2009 21:40:50 +0000 (23:40 +0200)
commitdcbf77cac640af0ab944d5cbb07934bf6708b4d9
treee2f4d1b3a1089ee10436cb19740a9cb99f2dc527
parentc00aafcd4977769e8728292302ddbbb8b1082fab
parent85dfd81dc57e8183a277ddd7a56aa65c96f3f487
Merge branch 'master' into for-linus