From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Oct 2012 06:54:27 +0000 (+0900)
Subject: Merge branch 'linux-next' of git://git.open-osd.org/linux-open-osd
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8711798772641b2f593beebebcab5b1ec2309f0c;p=openwrt%2Fstaging%2Fblogic.git

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()
---

8711798772641b2f593beebebcab5b1ec2309f0c