diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 17:37:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 17:37:29 +0200 |
| commit | 4efb686205d5065f4e488e20fc858446b8ad7bb7 (patch) | |
| tree | 34502cd2ba57fa1418d66cf93d10d43c40c3f6f4 /kernel/nsproxy.c | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | cdrom: update ioctl documentation (diff) | |
| download | linux-4efb686205d5065f4e488e20fc858446b8ad7bb7.tar.xz linux-4efb686205d5065f4e488e20fc858446b8ad7bb7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
cdrom: update ioctl documentation
ide: note that IDE generic may prevent other drivers from attaching
ide-tape: fix vendor strings
Swarm: Fix crash due to missing initialization
Diffstat (limited to 'kernel/nsproxy.c')
0 files changed, 0 insertions, 0 deletions