tree a1456ef8aea8beb8415d8258a978e072467d8ff6
parent b9d40b7b1e349bdc5c174b4ef1a333e62f7d749c
parent 2dca6999eed58d44b67e9de7d6ec230f6250553d
author Linus Torvalds <torvalds@linux-foundation.org> 1255028750 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255028750 -0700

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