Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Feb 2011 01:51:27 +0000 (17:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Feb 2011 01:51:27 +0000 (17:51 -0800)
commita0aeccdc694d5db3b4310a6ed1ce4f88974cf7b4
tree2a4e8f8a2641eccd96d5d2aa58d9cf5aa6546c4c
parentfa7ea87a057958a8b7926c1a60a3ca6d696328ed
parentb62818e5ff78cab4daf04fc0c12f86475dbc4b69
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