]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0ca4323 c6446a4)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Nov 2006 05:17:23 +0000 (21:17 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Nov 2006 05:17:23 +0000 (21:17 -0800)
commit30574b61611ccd29677989097f8c8a5d9a73d873
tree8385fb5018037402db9adb727b9755bc5b43ac92tree
parent0ca43235b34c92278fa903297acef37198ec3e26commit | diff
parentc6446a4cdadaf411bafe1565e9fa7666f3c2fe95commit | diff
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] ata_piix: allow 01b MAP for both ICH6M and ICH7M
  [PATCH] libata: unexport ata_dev_revalidate()
  [PATCH] Add 0x7110 piix to ata_piix.c
  [PATCH] sata_sis: fix flags handling for the secondary port
Ubuntu Disco kernel mirror for Proxmox VE and PMG