]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
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)
1  2 
drivers/base/platform.c

Simple merge