Merge branch 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/pub/scm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Oct 2009 19:05:50 +0000 (12:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Oct 2009 19:05:50 +0000 (12:05 -0700)
commitb924f9599dfd4a604761e84b1e920e480fb57f66
treea1456ef8aea8beb8415d8258a978e072467d8ff6
parentb9d40b7b1e349bdc5c174b4ef1a333e62f7d749c
parent2dca6999eed58d44b67e9de7d6ec230f6250553d
Merge branch 'sparc-perf-events-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  mm, perf_event: Make vmalloc_user() align base kernel virtual address to SHMLBA
  perf_event: Provide vmalloc() based mmap() backing
arch/sparc/Kconfig
mm/vmalloc.c