git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: abb139e 702e490)
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)
commit3a494318b14b1bc0f59d2d6ce84c505c74d82d2a
tree68918bebe684be45630061e10b036132e9db7198tree | snapshot
parentabb139e75c2cdbb955e840d6331cb5863e409d0ecommit | diff
parent702e490211b2b7e448ebe1b3a07d97ad2fc07e03commit | diff
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
Pandora Kernel Repository