diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-27 18:23:41 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-27 18:23:41 -0800 | 
| commit | 21f122f47205258e166479e1223898941c6aa6a1 (patch) | |
| tree | 2bb3b86ed6b22fbea6864654642167244707200e /net/lapb/lapb_in.c | |
| parent | ae979430e3e2ac23ae44c37077f1171ff5829d7b (diff) | |
| parent | 152d44a853e42952f6c8a504fb1f8eefd21fd5fd (diff) | |
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 'net/lapb/lapb_in.c')
0 files changed, 0 insertions, 0 deletions
