commit fa24aa561a3cf91cf25b5d4066470b08a2d24206
author Linus Torvalds <torvalds@woody.linux-foundation.org> Fri May 04 20:44:54 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Fri May 04 20:44:54 2007 -0700
tree 9002f7fb2dfd20b05062cd8dd69a7dda6372f23f
parent 6cbf0c704d7c3bb215ae7e0381b1ff2ad5931f35
parent 9315f130e11249457f5c3a7f74ee82a7065bd854

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: Force use of GFP_NOFS in ocfs2_write()
  ocfs2: fix sparse warnings in fs/ocfs2/cluster
  ocfs2: fix sparse warnings in fs/ocfs2/dlm
  ocfs2: fix sparse warnings in fs/ocfs2
  [PATCH] Copy i_flags to ocfs2 inode flags on write
  [PATCH] ocfs2: use __set_current_state()
  ocfs2: Wrap access of directory allocations with ip_alloc_sem.
  [PATCH] fs/ocfs2/: make 3 functions static
  ocfs2: Implement compat_ioctl()