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)
1  2 
drivers/pci/pci-driver.c

Simple merge