From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Jan 2009 02:12:58 +0000 (-0800)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
X-Git-Tag: v2.6.29-rc4~102
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d280884961de51afd87465f72ade9e8876d1e26;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

* 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: allow direct user-space I/O
  UBI: fix resource de-allocation
  UBI: remove unused variable
  UBI: use nicer 64-bit math
  UBI: add ioctl compatibility
  UBI: constify file operations
  UBI: allow all ioctls
  UBI: remove unnecessry header inclusion
  UBI: improve ioctl commentaries
  UBI: add ioctl for is_mapped operation
  UBI: add ioctl for unmap operation
  UBI: add ioctl for map operation
---

0d280884961de51afd87465f72ade9e8876d1e26