Merge branch 'for-next' of git://www.jni.nu/cris into cris_merge
authorJesper Nilsson <jesper.nilsson@axis.com>
Wed, 29 Oct 2008 16:28:40 +0000 (17:28 +0100)
committerJesper Nilsson <jesper.nilsson@axis.com>
Wed, 29 Oct 2008 16:28:40 +0000 (17:28 +0100)

Trivial merge