Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Oct 2011 19:16:28 +0000 (22:16 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Oct 2011 19:16:28 +0000 (22:16 +0300)
commitfd11e153b82ad1c84ccc71ba1cfedc222465198c
treeeb62a490ca322d0a41a41ad94820677ef7737b1b
parent505f48b53478d3816d1f3b001815703cfd7afa09
parentaad4564498dcb0aad769a79e5e2aa9a661dfb51f
Merge git://git./linux/kernel/git/davem/sparc

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Add alignment flag to PCI expansion resources
  sparc: Avoid calling sigprocmask()
  sparc: Use set_current_blocked()
  sparc32,leon: SRMMU MMU Table probe fix