]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4dee3c1 c7b76a3)
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)
commit74aa453b8f3641d384046375d089bd3238321049
tree68918bebe684be45630061e10b036132e9db7198tree | snapshot
parent4dee3c1e0d2ba80bfce6006e23e7785e33fd0c7fcommit | diff
parentc7b76a33e0a29b33e82f14dabec9833a5eb58ac2commit | diff
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
Linux Kernel Source Tree.