Merge commit 'v2.6.32-rc3'
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Tue, 6 Oct 2009 15:36:55 +0000 (17:36 +0200)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Tue, 6 Oct 2009 15:36:55 +0000 (17:36 +0200)

Trivial merge