diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 18:00:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 18:00:25 -0700 |
| commit | c206d44ffdd539f5f4553e1a92cc7711084c1d3c (patch) | |
| tree | c2bfef721c91c3f468fb9a52bf69a785e4889128 /net/ipv6/xfrm6_tunnel.c | |
| parent | 83ae170092c8ec4d8a268d93438054e32493ee17 (diff) | |
| parent | 1d6225e8cc5598f2bc5c992f9c88b1137763e8e1 (diff) | |
| download | op-kernel-dev-c206d44ffdd539f5f4553e1a92cc7711084c1d3c.zip op-kernel-dev-c206d44ffdd539f5f4553e1a92cc7711084c1d3c.tar.gz | |
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, UV: Make kdump avoid stack dumps - fix !CONFIG_KEXEC breakage
x86, UV: Initialize BAU hub map
x86, UV: Make kdump avoid stack dumps
Diffstat (limited to 'net/ipv6/xfrm6_tunnel.c')
0 files changed, 0 insertions, 0 deletions
