Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Aug 2010 15:58:30 +0000 (08:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Aug 2010 15:58:30 +0000 (08:58 -0700)
commit673b864fd76a29031aa0b4b08fc80886d527b3b7
treec9b3f01206e7d0dd5c801b504bfd7e82383470d6
parent93b9e9a2d91b8a6c93f14e98382694f83de9f02e
parent71cd03b0044183843318bfac0b6ce5868a96ef34
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  arch/sparc/mm: Use GFP_KERNEL
  MAINTAINERS: Add trailing slash to SBUS path.
  sbus: autoconvert trivial BKL users to private mutex
MAINTAINERS