diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:17:01 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:17:01 +1100 |
commit | 9f72a3a19c1ca629d80c5ddc7eae2e1cb4bd1dcb (patch) | |
tree | 6522c1e900bf2d02d0a08fa5fc00e3ec9b4482f7 /arch/avr32 | |
parent | c47a63ccb4637bf4e01733e85ecdc269f5d3e76e (diff) | |
parent | ddf12286951aee1e7763112cf26629de3fabe6ae (diff) |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
MAINTAINERS
fs/eventpoll.c
Diffstat (limited to 'arch/avr32')
-rw-r--r-- | arch/avr32/mm/cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/mm/cache.c b/arch/avr32/mm/cache.c index 24a74d1ca7d9..6a46ecd56cfd 100644 --- a/arch/avr32/mm/cache.c +++ b/arch/avr32/mm/cache.c @@ -113,7 +113,7 @@ void flush_icache_range(unsigned long start, unsigned long end) } /* - * This one is called from do_no_page(), do_swap_page() and install_page(). + * This one is called from __do_fault() and do_swap_page(). */ void flush_icache_page(struct vm_area_struct *vma, struct page *page) { |