Merge branch 'asm_cris_kbuild' into cris
authorJesper Nilsson <jesper@jni.nu>
Mon, 30 Jun 2008 22:14:07 +0000 (00:14 +0200)
committerJesper Nilsson <jesper@jni.nu>
Mon, 30 Jun 2008 22:14:07 +0000 (00:14 +0200)

Trivial merge