From: Linus Torvalds Date: Thu, 5 Aug 2010 15:58:30 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Tag: v2.6.36-rc1~561 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=673b864fd76a29031aa0b4b08fc80886d527b3b7;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: arch/sparc/mm: Use GFP_KERNEL MAINTAINERS: Add trailing slash to SBUS path. sbus: autoconvert trivial BKL users to private mutex --- 673b864fd76a29031aa0b4b08fc80886d527b3b7 Reading git-diff-tree failed