Merge branch 'master' into for-linus
commit39cf0518d89d1f0af79554457c52adb5b12fa43c
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 20 Aug 2009 18:24:33 +0000 (20 20:24 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 20 Aug 2009 18:24:33 +0000 (20 20:24 +0200)
tree3d04a6efe1e2afb6db7091af4b7033a56ae1b077
parentaf15c1addf920d830b030e3489a482456904ca8c
parent6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f
Merge branch 'master' into for-linus