| commit | f1ea7254726d25a333056619ec6b1a8ee1b7358d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 06 14:27:57 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 06 14:27:57 2008 -0700 |
| tree | ad0a6307890595172406fda45ec763f7a6bb8686 | |
| parent | ba9b0c11285bcdaa3243c4123e924094b626c740 [diff] | |
| parent | ca09a237b8c6b053e101a4a83bc30d2c48435bd5 [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: ide: workaround for bogus gcc warning in ide_sysfs_register_port() ide-cd: Optiarc DVD RW AD-7200A does play audio IDE: Fix platform device registration in Swarm IDE driver (v2) ide-dma: fix ide_build_dmatable() for TRM290 ide-cd: temporary tray close fix