diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-19 04:24:16 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-19 04:24:16 +0900 |
| commit | 7553c7e68fd144643e74a279ef51b74a15214071 (patch) | |
| tree | 5ad08f6de205a14eeba1793aa641e6b25c22b2c1 /arch/mips/mm/sc-ip22.c | |
| parent | 423de92f56bdfc3e68503af31e6ec041d59a6a25 (diff) | |
| parent | c3b46c73264b03000d1e18b22f5caf63332547c9 (diff) | |
| download | linux-next-7553c7e68fd144643e74a279ef51b74a15214071.tar.gz | |
Merge 4.6-rc4 into char-misc-next
We want the fixes in there to build off of for other dependant patches.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/mm/sc-ip22.c')
| -rw-r--r-- | arch/mips/mm/sc-ip22.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/sc-ip22.c b/arch/mips/mm/sc-ip22.c index dc7c5a5214a9..026cb59a914d 100644 --- a/arch/mips/mm/sc-ip22.c +++ b/arch/mips/mm/sc-ip22.c @@ -158,7 +158,7 @@ static inline int __init indy_sc_probe(void) return 1; } -/* XXX Check with wje if the Indy caches can differenciate between +/* XXX Check with wje if the Indy caches can differentiate between writeback + invalidate and just invalidate. */ static struct bcache_ops indy_sc_ops = { .bc_enable = indy_sc_enable, |