| commit | d798f7f080805ad7e15fc37a43d8c6f91edb6dda | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun May 22 22:08:32 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun May 22 22:08:32 2011 -0700 |
| tree | 73e3783cb619d3a5dc40a5f32859f063b5cd0664 | |
| parent | e98bae7592a44bdce2e49ccd64f3c7ffe244a0f6 [diff] | |
| parent | db210f824c2f155703edf03bc2137da1bd76e27d [diff] |
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