Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Jan 2012 20:51:01 +0000 (12:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Jan 2012 20:51:01 +0000 (12:51 -0800)
commit9e203936eac786f9268d6a13e6442d2accef1829
tree1da906e1c099b3afacf3b358b8981931c4da45fd
parent993ecff81aa6d50d694704de2647a5529ff2f166
parent724577ca355795b0a25c93ccbeee927871ca1a77
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  ore: Must support none-PAGE-aligned IO
  ore: fix BUG_ON, too few sgs when reading
  ore: Fix crash in case of an IO error.
  ore: FIX breakage when MISC_FILESYSTEMS is not set
fs/Kconfig