Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
authorJesper Nilsson <jesper.nilsson@axis.com>
Thu, 2 Apr 2009 14:02:42 +0000 (16:02 +0200)
committerJesper Nilsson <jesper.nilsson@axis.com>
Thu, 2 Apr 2009 14:02:42 +0000 (16:02 +0200)

Trivial merge