diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-17 15:01:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-17 15:01:23 -0800 |
| commit | 0bc77ecbe4f69ff8ead1d2abfe84ca9ba2a7bca4 (patch) | |
| tree | a9d2f83e9ee9b20720cd83432ce7bfeb44690b3d /net/unix/af_unix.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| parent | ocfs2: Add JBD2 compat feature bit. (diff) | |
| download | linux-dev-0bc77ecbe4f69ff8ead1d2abfe84ca9ba2a7bca4.tar.xz linux-dev-0bc77ecbe4f69ff8ead1d2abfe84ca9ba2a7bca4.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: Add JBD2 compat feature bit.
ocfs2: Always update xattr search when creating bucket.
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions