summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-02 16:30:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-02 16:30:47 -0700
commit7e567b44e6c59ad8bec321afb03302ffb1e6dda6 (patch)
treebd02466f931a471691db1da47d6d072924cfef1f /scripts
parent020f932bd246e9d595f7a006250762d98ffeab46 (diff)
parent2191aebaf9af9125bfee32808babe6f61446c8a6 (diff)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2: Change repository in MAINTAINERS. ocfs2: Fix a missing credit when deleting from indexed directories. ocfs2/trivial: Remove unused variable in ocfs2_rename. ocfs2: Add missing iput() during error handling in ocfs2_dentry_attach_lock() ocfs2: Fix some printk() warnings. ocfs2: Fix 2 warning during ocfs2 make. ocfs2: Reserve 1 more cluster in expanding_inline_dir for indexed dir.
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions