tree 0190a2610ade331b4be8e1efd094c0ad2b2ba181
parent bb8ad2815a1210bfa56b8f8ebf0e40fbdf9198ff
parent bc47df0fa705887242c26c7b040e7cf0170ab1f1
author Linus Torvalds <torvalds@linux-foundation.org> 1247278344 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1247278344 -0700

Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  osdblk: Adjust queue limits to lower device's limits
  osdblk: a Linux block device for OSD objects
  MAINTAINERS: Add osd maintained files (F:)
  exofs: Avoid using file_fsync()
  exofs: Remove IBM copyrights
  exofs: Fix bio leak in error handling path (sync read)