summaryrefslogtreecommitdiffstats
path: root/drivers/net/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds2007-05-10 00:41:31 +0200
committerLinus Torvalds2007-05-10 00:41:31 +0200
commit3cb7396b7b26585b1ab7c1a8ca554ec103da5d37 (patch)
tree94720199f016045fe2a204ac8fd26c0029f4544c /drivers/net/Makefile
parentMerge git://git.linux-nfs.org/pub/linux/nfs-2.6 (diff)
parentide: fix PIO setup on resume for ATAPI devices (diff)
downloadkernel-qcow2-linux-3cb7396b7b26585b1ab7c1a8ca554ec103da5d37.tar.gz
kernel-qcow2-linux-3cb7396b7b26585b1ab7c1a8ca554ec103da5d37.tar.xz
kernel-qcow2-linux-3cb7396b7b26585b1ab7c1a8ca554ec103da5d37.zip
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: fix PIO setup on resume for ATAPI devices ide: legacy PCI bus order probing fixes ide: add ide_proc_register_port() ide: add "initializing" argument to ide_register_hw() ide: cable detection fixes (take 2) ide: move IDE settings handling to ide-proc.c ide: split off ioctl handling from IDE settings (v2) ide: make /proc/ide/ optional ide: add ide_tune_dma() helper ide: rework the code for selecting the best DMA transfer mode (v3) ide: fix UDMA/MWDMA/SWDMA masks (v3)
Diffstat (limited to 'drivers/net/Makefile')
0 files changed, 0 insertions, 0 deletions