git://ftp.safe.ca / safe / jmp / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9d40b7 2dca699)
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)
* '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

1  2 
arch/sparc/Kconfig patch | diff1 | diff2 | blob | history
mm/vmalloc.c patch | diff1 | diff2 | blob | history

diff --cc arch/sparc/Kconfig
Simple merge
diff --cc mm/vmalloc.c
Simple merge
Full containers within linux kernel