| commit | 09a9ad6a1ff86836e5280c39300176c4758bb459 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Oct 13 13:23:39 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Oct 13 13:23:39 2012 -0700 |
| tree | 27967b60cbb53def07f4ceb8365efb8206c2a777 | |
| parent | 9db908806b85c1430150fbafe269a7b21b07d15d [diff] | |
| parent | e9069f470803eeb5e243a05bc717452c6218bd71 [diff] |
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