From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Aug 2012 20:16:57 +0000 (-0700)
Subject: Merge git://git.tdb.fi/ext/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=e4955f9be116cd413e8ee3986d737e9e1b95e348;hp=e4955f9be116cd413e8ee3986d737e9e1b95e348;p=ext%2Fsubsurface.git

Merge git://git.tdb.fi/ext/subsurface

Pull a few buglet fixes from Mikko Rasa.

Some trivial conflicts due to changes in the dive selection logic, and
using the new "for_each_dive()" helper.

* git://git.tdb.fi/ext/subsurface:
  Check if multi-dive editing is actually needed
  Fix an off-by-one error in buffer allocation
---