From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Oct 2012 20:23:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm... 
X-Git-Tag: v3.7-rc1~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=09a9ad6a1ff86836e5280c39300176c4758bb459;p=~emulex%2Finfiniband.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
---

09a9ad6a1ff86836e5280c39300176c4758bb459