tree 3d2c9697a67009b990f10f0bd7f2ae56d43961a5
parent 121977187ca0a7f20b848530deb04cc56167769b
parent 7f8d145d43ebfe4526e12021324ffd9f24e1ee81
author Linus Torvalds <torvalds@linux-foundation.org> 1349765667 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1349765667 +0900

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

Pull exofs update from Boaz Harrosh:
 "Just three one liners"

* 'linux-next' of git://git.open-osd.org/linux-open-osd:
  pnfs_osd_xdr: Remove unused #include from pnfs_osd_xdr.h
  ore: signedness bug in _sp2d_min_pg()
  exofs: check for allocation failure in uri_store()