summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-06 20:08:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-06 20:08:25 -0800
commit086b17046c068ef3fa6e69c03c786b39ca617a0a (patch)
tree027f1aac84c1c8eb990a027be963821643cf4d7f /Makefile
parentda8f2e246183ae109f87694ee3f06e8fcca2931b (diff)
parent226291aa4641fa13cb5dec3bcb3379faa83009e2 (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_connection_find() returns pointer to bad structure ocfs2: char is not always signed Ocfs2: Stop tracking a negative dentry after dentry_iput(). ocfs2: fix memory leak fs/ocfs2/dlm: Use GFP_ATOMIC under spin_lock
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions