From: Linus Torvalds Date: Fri, 18 Feb 2011 01:51:27 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Tag: v3.12-rc1~7148 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0aeccdc694d5db3b4310a6ed1ce4f88974cf7b4;p=kernel%2Fkernel-generic.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: Fix NMI startup bug which also breaks perf. sparc: fix size argument to find_next_zero_bit() sparc: use bitmap_set() sparc32: unaligned memory access (MNA) trap handler bug --- a0aeccdc694d5db3b4310a6ed1ce4f88974cf7b4