Merge branch 'for-linus-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 May 2015 23:33:59 +0000 (16:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 May 2015 23:33:59 +0000 (16:33 -0700)
Pull UML hostfs fix from Richard Weinberger:
 "This contains a single fix for a regression introduced in 4.1-rc1"

* 'for-linus-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  hostfs: Use correct mask for file mode


Trivial merge