Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Sun, 12 Oct 2008 13:44:33 +0000 (15:44 +0200)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Sun, 12 Oct 2008 13:44:33 +0000 (15:44 +0200)

Trivial merge