Merge branch 'master' into for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 29 Jul 2009 18:28:08 +0000 (20:28 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 29 Jul 2009 18:28:08 +0000 (20:28 +0200)
commitb4093d6235b7e4249616651ee328600ced48a18a
tree9f5b8e466e2d26fbe13ee7934f9e939a09815bd5
parentd9ab77161d811ffb0bccf396f7155cc905c1b9e1
parent7d3e91b8a1f5179d56a7412d4b499f2d5fc6b25d
Merge branch 'master' into for-linus