projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 79a69d3 f9fd348)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Feb 2013 22:31:26 +0000 (14:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Feb 2013 22:31:26 +0000 (14:31 -0800)
commit8ec4942212a6d337982967778a3dc3b60aea782e
tree35e58e18bb32969fbf6b7d229323fac144e1b265tree | snapshot
parent79a69d342d71b2b4eafdf51e2451606cfe380a44commit | diff
parentf9fd3488f6a3c2c5cc8613e4fd7fbbaa57f6bf8fcommit | diff
Merge git://git./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().
Domain: System / Kernel;