Pull nptcg into release branch

Conflicts:

	arch/ia64/mm/tlb.c

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/ia64/kernel/setup.c
Simple merge

diff --cc arch/ia64/mm/tlb.c
index 3d8903f,1a8948f..d52ec4e
--- 1/arch/ia64/mm/tlb.c
--- 2/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@@ -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 */