]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 May 2011 05:08:32 +0000 (22:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 May 2011 05:08:32 +0000 (22:08 -0700)
commite263c04257e9249794d4c2dfa689afcbf90327c0
tree73e3783cb619d3a5dc40a5f32859f063b5cd0664
parent6a006f1dcf2c69d5e2271dec847687f25f421336
parent8ff65298b56f373613e5c73868b9cbc028c7890a
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
drivers/ide/ide-floppy.c