]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d5a169c c1183a3)
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 11 Jun 2007 18:31:43 +0000 (11:31 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 11 Jun 2007 18:31:43 +0000 (11:31 -0700)
commitbb3d2dd72302ea3eefcc6738cdd39ed5864b62f8
tree94aea714ae4b2b39e05aeb32d0dffccc8a15a8a8tree | snapshot
parentd5a169c87967981d06616c3c99408bc40ec9f618commit | diff
parentc1183a3345f2e553fa0907a453cbb311c7e1698ccommit | diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: Add the MCP73/77 support to PATA driver
  Add the PATA controller device ID to pci_ids.h for MCP73/MCP77.
  hpt366: disallow Ultra133 for HPT374
  ide: generic IDE PCI driver, add another device exception
  ide: HPA detect from resume
  it821x: RAID mode fixes
  serverworks: fix CSB6 tuning logic
  serverworks: remove crappy code
Linux 2.6 source tree