Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Fri, 27 Mar 2009 15:14:38 +0000 (16:14 +0100)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Fri, 27 Mar 2009 15:14:38 +0000 (16:14 +0100)

Trivial merge