Commit 2c34ff14 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32 

Pull avr32 update from Hans-Christian Noren Egtvedt.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: migrate exception table users off module.h and onto extable.h
parents 07021b43 9a2950fe

arch/avr32/kernel/traps.c

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ 
#include <linux/init.h>

#include <linux/kallsyms.h>

#include <linux/kdebug.h>

#include <linux/module.h>

#include <linux/extable.h>

#include <linux/module.h>	/* print_modules */

#include <linux/notifier.h>

#include <linux/sched.h>

#include <linux/uaccess.h>

arch/avr32/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 */



#include <linux/mm.h>

#include <linux/module.h>

#include <linux/extable.h>

#include <linux/pagemap.h>

#include <linux/kdebug.h>

#include <linux/kprobes.h>