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 /kernel/sched_stats.h | |
| parent | 3797455fd269f6ae0bc228d5206b502830af03f4 (diff) | |
| parent | a97721894a6dc0f9ebfe1dbaa4bb112eaf399273 (diff) | |
| download | blackbird-op-linux-0bc77ecbe4f69ff8ead1d2abfe84ca9ba2a7bca4.tar.gz blackbird-op-linux-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 'kernel/sched_stats.h')
0 files changed, 0 insertions, 0 deletions
