From: Linus Torvalds Date: Tue, 10 Aug 2010 04:05:17 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Tag: v2.6.36-rc1~307 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d15393d20c1934a296a999d8ede125532d21cc4;p=pandora-kernel.git Merge git://git./linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Update defconfig. sparc: Kill user copy check code. sparc64: Fix perf_arch_get_caller_regs(). sparc64: Add missing ID to parport probing code. --- 4d15393d20c1934a296a999d8ede125532d21cc4 Reading git-diff-tree failed