diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 21:05:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 21:05:50 +0200 |
| commit | b924f9599dfd4a604761e84b1e920e480fb57f66 (patch) | |
| tree | a1456ef8aea8beb8415d8258a978e072467d8ff6 /include/net/ipv6.h | |
| parent | Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | mm, perf_event: Make vmalloc_user() align base kernel virtual address to SHMLBA (diff) | |
| download | linux-b924f9599dfd4a604761e84b1e920e480fb57f66.tar.xz linux-b924f9599dfd4a604761e84b1e920e480fb57f66.zip | |
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
Diffstat (limited to 'include/net/ipv6.h')
0 files changed, 0 insertions, 0 deletions