]> rtime.felk.cvut.cz Git - linux-imx.git/commit
projects / linux-imx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1e24f76 58cd57b)
Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Aug 2013 22:19:58 +0000 (15:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Aug 2013 22:19:58 +0000 (15:19 -0700)
commit022e5d098b3bcc4a9a75c24e910a08ff9d2321d2
tree3d73743a2258b03a7e7c5b52500d4d01f75c9424tree | snapshot
parent1e24f76e231f2b68b01b61610ec235f7ea331513commit | diff
parent58cd57bfd9db3bc213bf9d6a10920f82095f0114commit | diff
Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux

Pull nfsd fixes from Bruce Fields:
 "Some fixes for a 4.1 feature that in retrospect probably should have
  waited for 3.12....  But it appears to be working now"

* 'for-3.11' of git://linux-nfs.org/~bfields/linux:
  nfsd: Fix SP4_MACH_CRED negotiation in EXCHANGE_ID
  nfsd4: Fix MACH_CRED NULL dereference
Local Linux development repo for Freescale iMX