diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 16:36:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 16:36:59 -0400 |
| commit | 04b7fe6a4a231871ef681bc95e08fe66992f7b1f (patch) | |
| tree | d9eba9e6a57ad9323268b6bc9a7e5516d18e9583 /net/ipv4/ip_forward.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | ide: remove deprecated use of pci api (diff) | |
| download | linux-dev-04b7fe6a4a231871ef681bc95e08fe66992f7b1f.tar.xz linux-dev-04b7fe6a4a231871ef681bc95e08fe66992f7b1f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE update from David Miller:
"Just one change, getting rid of usage of the deprecated PCI DMA
interfaces in the IDE drivers"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
ide: remove deprecated use of pci api
Diffstat (limited to 'net/ipv4/ip_forward.c')
0 files changed, 0 insertions, 0 deletions