diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-04 01:09:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-04 01:09:09 +0200 |
| commit | 3a494318b14b1bc0f59d2d6ce84c505c74d82d2a (patch) | |
| tree | 68918bebe684be45630061e10b036132e9db7198 /arch | |
| parent | firmware: teach the kernel to load firmware files directly from the filesystem (diff) | |
| parent | userns: Fix build of drivers/staging/dgrp (diff) | |
| download | linux-3a494318b14b1bc0f59d2d6ce84c505c74d82d2a.tar.xz linux-3a494318b14b1bc0f59d2d6ce84c505c74d82d2a.zip | |
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 'arch')
0 files changed, 0 insertions, 0 deletions