diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-05 18:56:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-05 18:56:22 -0800 |
| commit | 9f225788cc047fb7c2ef2326eb4f86dee890e2ef (patch) | |
| tree | e7571bb7ccc674ec166efb940ad4908bf88b6037 /drivers/w1/w1_family.c | |
| parent | d7b815d4daac154a029faf4e8b687a75530d43be (diff) | |
| parent | 54c9b2253d34e8998e4bff9ac2d7a3ba0b861d52 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Ben Herrenschmidt:
"Here are a few powerpc bits & fixes for rc1. A couple of str*cpy
fixes, some fixes in handling the FSCR register on Power8 (controls
the enabling of processor features), a 32-bit build fix and a couple
more nits."
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Set DSCR bit in FSCR setup
powerpc: Add DSCR FSCR register bit definition
powerpc: Fix setting FSCR for HV=0 and on secondary CPUs
powerpc: Wireup the kcmp syscall to sys_ni
powerpc: Remove unused BITOP_LE_SWIZZLE macro
powerpc: Avoid link stack corruption in MMU on syscall entry path
drivers/tty/hvc: Use strlcpy instead of strncpy
powerpc/pseries/hvcserver: Fix strncpy buffer limit in location code
powerpc: Fix compile of sha1-powerpc-asm.S on 32-bit
Diffstat (limited to 'drivers/w1/w1_family.c')
0 files changed, 0 insertions, 0 deletions