]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Oct 2012 23:09:09 +0000 (16:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Oct 2012 23:09:09 +0000 (16:09 -0700)
commiteefbe406d16e0df7580816aea6d58225cea9f88c
tree68918bebe684be45630061e10b036132e9db7198
parentd4fe0ea3a3fe16ad3d6e99c0ab5802de41211c9f
parentb2897d01cd30b2ae127ef37f5c5421363c170a2b
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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