From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Aug 2011 05:56:03 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c2f340a69cabe0fb7b9f02d1a2495927db225a06;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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: Make ore its own module
  exofs: Rename raid engine from exofs/ios.c => ore
  exofs: ios: Move to a per inode components & device-table
  exofs: Move exofs specific osd operations out of ios.c
  exofs: Add offset/length to exofs_get_io_state
  exofs: Fix truncate for the raid-groups case
  exofs: Small cleanup of exofs_fill_super
  exofs: BUG: Avoid sbi realloc
  exofs: Remove pnfs-osd private definitions
  nfs_xdr: Move nfs4_string definition out of #ifdef CONFIG_NFS_V4
---

c2f340a69cabe0fb7b9f02d1a2495927db225a06