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)
commit92752b5cddcfe421767cf61151bf5a1553a6540b
tree2ec40ee20d4f5a906f83a5cb66e8ccd385d54d34
parent1630ee5e01c68ebee5e91da42a56f1865ffbfa1b
parenta718c92219b35e8a75175fde85c4566ac5730273
Merge branch 'for-linus-4.1-rc4' of git://git./linux/kernel/git/rw/uml

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