diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 22:23:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 22:23:39 +0200 |
| commit | 09a9ad6a1ff86836e5280c39300176c4758bb459 (patch) | |
| tree | 27967b60cbb53def07f4ceb8365efb8206c2a777 /fs/jbd | |
| parent | Merge tag 'md-3.7' of git://neil.brown.name/md (diff) | |
| parent | btrfs: Fix compilation with user namespace support enabled (diff) | |
| download | linux-09a9ad6a1ff86836e5280c39300176c4758bb459.tar.xz linux-09a9ad6a1ff86836e5280c39300176c4758bb459.zip | |
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
Diffstat (limited to 'fs/jbd')
0 files changed, 0 insertions, 0 deletions