From: Linus Torvalds Date: Sun, 8 Aug 2010 17:08:26 +0000 (-0700) Subject: Merge branch 'for-linus' of git://www.jni.nu/cris X-Git-Tag: v2.6.36-rc1~484 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=53bcef60633086ad73683d01a4ef9ca678484d2d;p=~andy%2Flinux Merge branch 'for-linus' of git://www.jni.nu/cris * 'for-linus' of git://www.jni.nu/cris: (51 commits) CRIS: Fix alignment problem for older ld CRIS: Always dump registers for segfaulting process. CRIS: Add config for pausing a seg-faulting process CRIS: Don't take faults while in_atomic CRIS: Fixup lookup for delay slot faults CRIS: Discard exit.text and .data at runtime CRIS: Add cache aligned and read mostly data sections CRIS: Return something from profile write CRIS: Add ARTPEC-3 and timestamps for sync-serial CRIS: Better ARTPEC-3 support for gpio CRIS: Add include guard CRIS: Better handling of pinmux settings CRIS: New DMA defines for ARTPEC-3 CRIS: __do_strncpy_from_user: Don't read the byte beyond the nil CRIS: Pagetable for ARTPEC-3 CRIS: Machine dependent memmap.h CRIS: Check if pointer is set before using it CRIS: Machine dependent dma.h CRIS: Define __read_mostly for CRISv32 CRIS: Discard .note.gnu.build-id section ... --- 53bcef60633086ad73683d01a4ef9ca678484d2d