Merge branch 'linux-next' of git://git.open-osd.org/linux-open-osd
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Oct 2012 06:54:27 +0000 (15:54 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Oct 2012 06:54:27 +0000 (15:54 +0900)
commit8711798772641b2f593beebebcab5b1ec2309f0c
tree3d2c9697a67009b990f10f0bd7f2ae56d43961a5
parent121977187ca0a7f20b848530deb04cc56167769b
parent7f8d145d43ebfe4526e12021324ffd9f24e1ee81
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()