diff options
| author | Linus Torvalds | 2013-02-20 14:31:26 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2013-02-20 14:31:26 -0800 |
| commit | 8ec4942212a6d337982967778a3dc3b60aea782e (patch) | |
| tree | 35e58e18bb32969fbf6b7d229323fac144e1b265 /net/ipv4/proc.c | |
| parent | 79a69d342d71b2b4eafdf51e2451606cfe380a44 (diff) | |
| parent | f9fd3488f6a3c2c5cc8613e4fd7fbbaa57f6bf8f (diff) | |
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 'net/ipv4/proc.c')
0 files changed, 0 insertions, 0 deletions