]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jul 2013 19:08:47 +0000 (12:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jul 2013 19:08:47 +0000 (12:08 -0700)
Pull ubifs fix from Artem Bityutskiy:
 "Only a single patch which fixes a message"

* tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs:
  UBIFS: correct mount message


Trivial merge