Merge branch 'master' into for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 16 Aug 2009 09:50:10 +0000 (11:50 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Sun, 16 Aug 2009 09:50:10 +0000 (11:50 +0200)
commit3e2bcad89814030ad6a369a97ad1481fd35938d3
tree8d6b9b163dc9ed44ec377ca5b57be1a1fb80f923
parentdcbf77cac640af0ab944d5cbb07934bf6708b4d9
parentb2add73dbf93fd50f00564d7abc3e2b9aa9dd20c
Merge branch 'master' into for-linus
drivers/base/platform.c