diff options
| author | Linus Torvalds <[email protected]> | 2014-11-28 02:23:41 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-11-28 02:23:41 +0000 |
| commit | 21f122f47205258e166479e1223898941c6aa6a1 (patch) | |
| tree | 2bb3b86ed6b22fbea6864654642167244707200e /drivers/tty/serial/sccnxp.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| parent | powerpc: 32 bit getcpu VDSO function uses 64 bit instructions (diff) | |
| download | kernel-21f122f47205258e166479e1223898941c6aa6a1.tar.gz kernel-21f122f47205258e166479e1223898941c6aa6a1.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
Pull powerpc fixes from Michael Ellerman:
"Here are five fixes for you to pull please.
They're all CC'ed to stable except the "Fix PE state format" one which
went in this release"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
powerpc: 32 bit getcpu VDSO function uses 64 bit instructions
powerpc/powernv: Replace OPAL_DEASSERT_RESET with EEH_RESET_DEACTIVATE
powerpc/eeh: Fix PE state format
powerpc/pseries: Fix endiannes issue in RTAS call from xmon
powerpc/powernv: Fix the hmi event version check.
Diffstat (limited to 'drivers/tty/serial/sccnxp.c')
0 files changed, 0 insertions, 0 deletions