projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a930d87 190b1ec)
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Mar 2013 16:20:58 +0000 (09:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Mar 2013 16:20:58 +0000 (09:20 -0700)
commit5b22b1848b7b5c28af8c7e916bbef08d4292a509
tree01d93ad5e1393fe92978dae6ca51459d2afa43c8tree | snapshot (tar.gz zip)
parenta930d8790552658140d7d0d2e316af4f0d76a512commit | diff
parent190b1ecf257be308f0053c371fa7afa1ba5f4932commit | diff
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux

Pull nfsd bugfixes from Bruce Fields:
 "Some minor fallout from the user-namespace work broke most krb5 mounts
  to nfsd, and I screwed up a change to the AF_LOCAL rpc code."

* 'for-3.9' of git://linux-nfs.org/~bfields/linux:
  sunrpc: don't attempt to cancel unitialized work
  nfsd: fix krb5 handling of anonymous principals
Motorola kernel-slsi