diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-18 18:46:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-18 18:46:56 -0800 |
| commit | 9a4c8546f3e7c893888bccc2b3416d6214f2664a (patch) | |
| tree | d97faff06ed816b82040dac8a01fc2454725b9c7 /net/netfilter | |
| parent | b0abcfc14605b2a8c686bd8e193ab05b01a7980b (diff) | |
| parent | 14e04c3f6e64bac468f0aa38c6d47aa95b60c074 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide-cd: fix missing residual count setting in DMA mode
ht6560b: force prefetch for some devices
ht6560b can only do up to PIO mode 4
linux/hdsmart.h: fix goofups (take 2)
via82cxxx: add new PCI id for cx700
falconide: locking bugfix
MAINTAINERS: update ide-cd maintainer's email address
ide/libata: ST310211A has buggy HPA too
ide: Add missing base addresses for falconide and macide
Diffstat (limited to 'net/netfilter')
0 files changed, 0 insertions, 0 deletions