From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 May 2012 20:54:31 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88... 
X-Git-Tag: v3.5-rc1~97
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=745914df47053c758f3d7999dfa82df184c2e5af;p=~emulex%2Finfiniband.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha

Pull alpha updates from Matt Turner:
 "This pull adds the implementations of some Tru64 syscalls which allow
  some proprietary software such as the C compiler to work on Linux.

  Also, it adds some big-endian ioread functions to help us get closer
  to building allyesconfig."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: add io{read,write}{16,32}be functions
  alpha: implement various OSF/1 stat syscalls
  alpha: implement setsysinfo(SSI_LMF) as a no-op
---

745914df47053c758f3d7999dfa82df184c2e5af