]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Pull nptcg into release branch
authorTony Luck <tony.luck@intel.com>
Thu, 17 Apr 2008 17:13:57 +0000 (10:13 -0700)
committerTony Luck <tony.luck@intel.com>
Thu, 17 Apr 2008 17:13:57 +0000 (10:13 -0700)
Conflicts:

arch/ia64/mm/tlb.c

1  2 
Documentation/kernel-parameters.txt
arch/ia64/kernel/setup.c
arch/ia64/mm/tlb.c

Simple merge
Simple merge
index 3d8903f936a580c5ee43ebe946a8a6da67d978e6,1a8948fd002905c361b17d135292bb1c630a8909..d52ec4e83409126647984095dd52bced8856d314
@@@ -26,8 -29,7 +29,9 @@@
  #include <asm/pal.h>
  #include <asm/tlbflush.h>
  #include <asm/dma.h>
 +#include <asm/processor.h>
+ #include <asm/sal.h>
 +#include <asm/tlb.h>
  
  static struct {
        unsigned long mask;     /* mask of supported purge page-sizes */