From: Linus Torvalds Date: Thu, 25 Apr 2013 00:10:18 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=0fbd06761f5c17cc9b20e02af60fd7ee9c895996;p=linux-edison.git Merge git://git./linux/kernel/git/davem/sparc Pull sparc fix from David Miller: "Brown paper bag fix for sparc64" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: Fix missing put_cpu_var() in tlb_batch_add_one() when not batching. --- 0fbd06761f5c17cc9b20e02af60fd7ee9c895996