]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 20:23:39 +0000 (13:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 20:23:39 +0000 (13:23 -0700)
commit09a9ad6a1ff86836e5280c39300176c4758bb459
tree27967b60cbb53def07f4ceb8365efb8206c2a777
parent9db908806b85c1430150fbafe269a7b21b07d15d
parente9069f470803eeb5e243a05bc717452c6218bd71
Merge branch 'for-linus' of git://git./linux/kernel/git/ebiederm/user-namespace

Pull user namespace compile fixes from Eric W Biederman:
 "This tree contains three trivial fixes.  One compiler warning, one
  thinko fix, and one build fix"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  btrfs: Fix compilation with user namespace support enabled
  userns: Fix posix_acl_file_xattr_userns gid conversion
  userns: Properly print bluetooth socket uids