diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-18 21:28:28 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-18 21:28:28 +0200 |
commit | 5614e7725856ea383f458377980298111439e0fb (patch) | |
tree | 82560034c3a17ee18073420406ba1228935e2967 /arch/tile/kernel/pci_gx.c | |
parent | devcoredump: add scatterlist support (diff) | |
parent | Linux 4.6-rc4 (diff) | |
download | linux-5614e7725856ea383f458377980298111439e0fb.tar.xz linux-5614e7725856ea383f458377980298111439e0fb.zip |
Merge 4.6-rc4 into driver-core-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/tile/kernel/pci_gx.c')
-rw-r--r-- | arch/tile/kernel/pci_gx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c index 4c017d0d2de8..aa2b44cd8fd3 100644 --- a/arch/tile/kernel/pci_gx.c +++ b/arch/tile/kernel/pci_gx.c @@ -1326,7 +1326,7 @@ invalid_device: /* - * See tile_cfg_read() for relevent comments. + * See tile_cfg_read() for relevant comments. * Note that "val" is the value to write, not a pointer to that value. */ static int tile_cfg_write(struct pci_bus *bus, unsigned int devfn, int offset, |