projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9b4d142 766fb95)
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jan 2009 02:12:58 +0000 (18:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jan 2009 02:12:58 +0000 (18:12 -0800)
commit0d280884961de51afd87465f72ade9e8876d1e26
treefa03d8593ddda2026545b369c4a87397deb7bdcatree | snapshot
parent9b4d142d521963ee1c53cefcd1f9790ca32b5db7commit | diff
parent766fb95ba06e1bbf531d30dc05e21b2d4a0e8dd2commit | diff
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
John Crispins staging tree