From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Jan 2012 20:51:01 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
X-Git-Tag: v3.3-rc1~150
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=9e203936eac786f9268d6a13e6442d2accef1829

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
---

9e203936eac786f9268d6a13e6442d2accef1829