From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Oct 2012 23:09:09 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm... 
X-Git-Tag: firefly_0821_release~3680^2~1923
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3a494318b14b1bc0f59d2d6ce84c505c74d82d2a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/ebiederm/user-namespace

Pull user namespace compile fix from Eric W Biederman:
 "This tree contains a trivial build fix for one of the staging drivers
  when user namespace support is enabled"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  userns: Fix build of drivers/staging/dgrp
---

3a494318b14b1bc0f59d2d6ce84c505c74d82d2a