From: Linus Torvalds Date: Mon, 21 Jul 2008 00:37:46 +0000 (-0700) Subject: Merge branch 'for-linus' of git://www.jni.nu/cris X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~31656 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3a533374283aea50eab3976d8a6d30532175f009;p=mirror_ubuntu-artful-kernel.git Merge branch 'for-linus' of git://www.jni.nu/cris * 'for-linus' of git://www.jni.nu/cris: [CRISv10] Clean up compressed/misc.c [CRISv10] Correct whitespace damage. [CRIS] Correct definition of subdirs for install_headers. [CRIS] Correct image makefiles to allow using a separate OBJ-directory. [CRIS] Build fixes for compressed and rescue images for v10 and v32: It looks at least odd to apply spin_unlock to a mutex. cris: compile fixes for 2.6.26-rc5 --- 3a533374283aea50eab3976d8a6d30532175f009