Merge branch 'master' into for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 5 Aug 2009 21:56:54 +0000 (23:56 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 5 Aug 2009 21:56:54 +0000 (23:56 +0200)
commitc00aafcd4977769e8728292302ddbbb8b1082fab
tree5766bcfbfd7b24816b54298b8ef34054f8cf0fae
parent2e6713c7662cc5ebc7346b033c404cb2f708fd51
parent90bc1a658a53f8832ee799685703977a450e5af9
Merge branch 'master' into for-linus