diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-20 23:31:26 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-20 23:31:26 +0100 |
commit | 8ec4942212a6d337982967778a3dc3b60aea782e (patch) | |
tree | 35e58e18bb32969fbf6b7d229323fac144e1b265 /include/net/ndisc.h | |
parent | Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | sparc32: refactor smp boot (diff) | |
download | linux-8ec4942212a6d337982967778a3dc3b60aea782e.tar.xz linux-8ec4942212a6d337982967778a3dc3b60aea782e.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
"Mostly more sparc64 THP bug fixes, and a refactoring of SMP bootup on
sparc32 from Sam Ravnborg."
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc32: refactor smp boot
sparc64: Fix huge PMD to PTE translation for sun4u in TLB miss handler.
sparc64: Fix tsb_grow() in atomic context.
sparc64: Handle hugepage TSB being NULL.
sparc64: Fix gfp_flags setting in tsb_grow().
Diffstat (limited to 'include/net/ndisc.h')
0 files changed, 0 insertions, 0 deletions