]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e98bae7 db210f8)
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)
commitd798f7f080805ad7e15fc37a43d8c6f91edb6dda
tree73e3783cb619d3a5dc40a5f32859f063b5cd0664tree | snapshot
parente98bae7592a44bdce2e49ccd64f3c7ffe244a0f6commit | diff
parentdb210f824c2f155703edf03bc2137da1bd76e27dcommit | 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
drivers/ide/ide-floppy.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules