git.openwrt.org Git - openwrt/staging/blogic.git/commitdiff

author	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Sat, 5 May 2007 03:44:54 +0000 (20:44 -0700)
committer	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Sat, 5 May 2007 03:44:54 +0000 (20:44 -0700)

* '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()

Trivial merge