git » linux-kernel » commit b924f95

Merge branch 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

author Linus Torvalds
2009-10-08 19:05:50 UTC
committer Linus Torvalds
2009-10-08 19:05:50 UTC
parent 2dca6999eed58d44b67e9de7d6ec230f6250553d
parent b9d40b7b1e349bdc5c174b4ef1a333e62f7d749c
Merge branch 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/pub/scm/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