diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 08:37:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 08:37:29 -0700 |
| commit | 4efb686205d5065f4e488e20fc858446b8ad7bb7 (patch) | |
| tree | 34502cd2ba57fa1418d66cf93d10d43c40c3f6f4 /arch/x86/kernel/apm_32.c | |
| parent | 0f873d5fb68a6aea9519c9cd613ddf4e7e2378d4 (diff) | |
| parent | d0eb40628e29c2bb3b5f8242b1d2f50b1a88d9da (diff) | |
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 'arch/x86/kernel/apm_32.c')
0 files changed, 0 insertions, 0 deletions