]> Git Repo - linux.git/commitdiff
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
authorLinus Torvalds <[email protected]>
Mon, 9 Jan 2012 20:51:01 +0000 (12:51 -0800)
committerLinus Torvalds <[email protected]>
Mon, 9 Jan 2012 20:51:01 +0000 (12:51 -0800)
* '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

1  2 
fs/Kconfig

diff --cc fs/Kconfig
Simple merge
This page took 0.076872 seconds and 4 git commands to generate.