diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 19:09:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 19:09:09 -0400 |
| commit | 3a494318b14b1bc0f59d2d6ce84c505c74d82d2a (patch) | |
| tree | 68918bebe684be45630061e10b036132e9db7198 /drivers/gpu/drm/nouveau/nv04_timer.c | |
| parent | abb139e75c2cdbb955e840d6331cb5863e409d0e (diff) | |
| parent | 702e490211b2b7e448ebe1b3a07d97ad2fc07e03 (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
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_timer.c')
0 files changed, 0 insertions, 0 deletions