Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Oct 2010 19:03:23 +0000 (12:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Oct 2010 19:03:23 +0000 (12:03 -0700)
commit267aeb6c142b1fbad1e6ed49f46d82113339141a
tree1e2b2d45734490a170fdbb5717f37c56e87614fe
parentd6bcfd1a214ae9609b27417b1844c6b6f09ca125
parentf17b1f9f1a5882e486aad469b9ac4cb18581707f
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  exofs: Fix double page_unlock BUG in write_begin/end