projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 993ecff 724577c)
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 patch | diff1 | diff2 | blob | history

diff --cc fs/Kconfig
Simple merge
John Crispins staging tree