Merge branch 'master' into for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Tue, 18 Aug 2009 21:37:37 +0000 (23:37 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Tue, 18 Aug 2009 21:37:37 +0000 (23:37 +0200)
commitaf15c1addf920d830b030e3489a482456904ca8c
treedc4adab63d19507f7ac44855ad9920f8fd2dd2f0
parente6f25a7b2398581a5f96bf9021d0b22c9647acf4
parentdcd94dbdaff452b95d4ba11fdbf853b5bda8e6e7
Merge branch 'master' into for-linus
arch/arm/plat-omap/gpio.c