Merge branch 'master' into for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Sat, 22 Aug 2009 22:03:00 +0000 (00:03 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Sat, 22 Aug 2009 22:03:00 +0000 (00:03 +0200)
commit8400146d0dc03590bba051399e4bb7e1cbf1c010
tree4c0c88273ff31e5e5f51c10d8727acab460b57ec
parent39cf0518d89d1f0af79554457c52adb5b12fa43c
parent3edf2fb9d80a46d6c32ba12547a42419845b4b76
Merge branch 'master' into for-linus
drivers/pci/pci-driver.c