From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Jul 2009 02:14:48 +0000 (-0700)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
X-Git-Tag: v2.6.31-rc3~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44c695b13bee558c73a89bc79f6253a4ba637386;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

* 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBIFS: fix corruption dump
  UBIFS: clean up free space checking
  UBIFS: small amendments in the LEB scanning code
  UBIFS: dump a little more in case of corruptions
  MAINTAINERS: update ahunter's e-mail address
  UBIFS: allow more than one volume to be mounted
  UBIFS: fix assertion warning
  UBIFS: minor spelling and grammar fixes
  UBIFS: fix 64-bit divisions in debug print
  UBIFS: few spelling fixes
  UBIFS: set write-buffer timout to 3-5 seconds
  UBIFS: slightly optimize write-buffer timer usage
  UBIFS: improve debugging messaged
  UBIFS: fix integer overflow warning
---

44c695b13bee558c73a89bc79f6253a4ba637386