diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 07:08:32 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 07:08:32 +0200 |
commit | d798f7f080805ad7e15fc37a43d8c6f91edb6dda (patch) | |
tree | 73e3783cb619d3a5dc40a5f32859f063b5cd0664 /fs/nilfs2 | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 (diff) | |
parent | ide/ide-scan-pci.c: Use for_each_pci_dev(). (diff) | |
download | linux-d798f7f080805ad7e15fc37a43d8c6f91edb6dda.tar.xz linux-d798f7f080805ad7e15fc37a43d8c6f91edb6dda.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide/ide-scan-pci.c: Use for_each_pci_dev().
ide: Use linux/mutex.h
IDE: ide-floppy, remove unnecessary NULL check
drivers/ide/pmac.c: Remove unnecessary casts of pci_get_drvdata
ide: fix use after free in ide-acpi
Diffstat (limited to 'fs/nilfs2')
0 files changed, 0 insertions, 0 deletions