tree c9b3f01206e7d0dd5c801b504bfd7e82383470d6
parent 93b9e9a2d91b8a6c93f14e98382694f83de9f02e
parent 71cd03b0044183843318bfac0b6ce5868a96ef34
author Linus Torvalds <torvalds@linux-foundation.org> 1281023910 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281023910 -0700

Merge git://git.kernel.org/pub/scm/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