]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
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)
* 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

1  2 
drivers/ide/ide-floppy.c

Simple merge