aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/dlm.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-30 11:41:27 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-30 11:41:27 -0500
commit597049ccd729e80c5eff7d907beeb58d908aac6f (patch)
tree49e6ffd8838ed00923876fa3b1ed8a145444fd1a /include/linux/dlm.h
parentd3143e71a95fe504c3d2d4a3b7aac126a588b1ac (diff)
parente0b874df14052489e6408125903dba96b4dd7baa (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: via82cxxx/pata_via: correct PCI_DEVICE_ID_VIA_SATA_EIDE ID and add support for CX700 and 8237S ide: unregister idepnp driver on unload ide: add missing __init tags to IDE PCI host drivers ia64: add pci_get_legacy_ide_irq() ide/generic: Jmicron has its own drivers now atiixp.c: add cable detection support for ATI IDE atiixp.c: sb600 ide only has one channel atiixp.c: remove unused code jmicron: fix warning ide: update MAINTAINERS entry
Diffstat (limited to 'include/linux/dlm.h')
0 files changed, 0 insertions, 0 deletions