diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-10 16:54:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-10 16:54:37 -0700 |
| commit | b9243b5a5d2da4eb0a54950f4e2d6272863b48be (patch) | |
| tree | 02d8f0d82b5e2419f20a85092ab5a5b894f2b461 /net/ceph/osdmap.c | |
| parent | 1604f8719a2dba692c12d333104fcc92613003af (diff) | |
| parent | 01ab60570427caa24b9debc369e452e86cd9beb4 (diff) | |
Merge branch 'parisc-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller:
"We have one important patch from Dave Anglin and myself which fixes
PTE/TLB race conditions which caused random segmentation faults on our
debian buildd servers, and one patch from Alex Ivanov which speeds up
the graphical text console on the STI framebuffer driver"
* 'parisc-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Fix some PTE/TLB race conditions and optimize __flush_tlb_range based on timing results
stifb: Implement hardware accelerated copyarea
Diffstat (limited to 'net/ceph/osdmap.c')
0 files changed, 0 insertions, 0 deletions