From: Linus Torvalds Date: Mon, 16 Aug 2010 00:31:43 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile X-Git-Tag: upstream/snapshot3+hdmi~13220 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a1b29a82ba76427de791098c095ce31dab9333d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge git://git./linux/kernel/git/cmetcalf/linux-tile * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: arch/tile: don't validate CROSS_COMPILE needlessly arch/tile: export only COMMAND_LINE_SIZE to userspace. arch/tile: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN arch/tile: Rename the hweight() implementations to __arch_hweight() arch/tile: extend syscall ABI to set r1 on return as well. arch/tile: Various cleanups. arch/tile: support backtracing on TILE-Gx arch/tile: Fix a couple of issues with the COMPAT code for TILE-Gx. arch/tile: Use separate, better minsec values for clocksource and sched_clock. arch/tile: correct a bug in freeing bootmem by VA for the optional second initrd. arch: tile: mm: pgtable.c: Removed duplicated #include arch: tile: kernel/proc.c Removed duplicated #include Add fanotify syscalls to . arch/tile: support new kunmap_atomic() naming convention. tile: remove unused ISA_DMA_THRESHOLD define Conflicts in arch/tile/configs/tile_defconfig (pick the mainline version with the reduced defconfig). --- 7a1b29a82ba76427de791098c095ce31dab9333d