From: Linus Torvalds Date: Fri, 27 Jan 2012 01:00:38 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc X-Git-Tag: firefly_0821_release~3680^2~3626 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c75d5c5d82146636560ad5b91f3544ae60fc1c57;p=firefly-linux-kernel-4.4.55.git Merge git://git./linux/kernel/git/davem/sparc * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc32: forced setting of mode of sun4m per-cpu timers --- c75d5c5d82146636560ad5b91f3544ae60fc1c57