]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Nov 2010 22:30:08 +0000 (07:30 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Nov 2010 22:30:08 +0000 (07:30 +0900)
* 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: release locks in check_corruption


Trivial merge