Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: (27 commits)
  [IA64] kdump: Add crash_save_vmcoreinfo for INIT
  [IA64] Fix NUMA configuration issue
  [IA64] Itanium Spec updates
  [IA64] Untangle sync_icache_dcache() page size determination
  [IA64] arch/ia64/kernel/: use time_* macros
  [IA64] remove redundant display of free swap space in show_mem()
  [IA64] make IOMMU respect the segment boundary limits
  [IA64] kprobes: kprobe-booster for ia64
  [IA64] fix getpid and set_tid_address fast system calls for pid namespaces
  [IA64] Replace explicit jiffies tests with time_* macros.
  [IA64] use goto to jump out do/while_each_thread
  [IA64] Fix unlock ordering in smp_callin
  [IA64] pgd_offset() constfication.
  [IA64] kdump: crash.c coding style fix
  [IA64] kdump: add kdump_on_fatal_mca
  [IA64] Minimize per_cpu reservations.
  [IA64] Correct pernodesize calculation.
  [IA64] Kernel parameter for max number of concurrent global TLB purges
  [IA64] Multiple outstanding ptc.g instruction support
  [IA64] Implement smp_call_function_mask for ia64
  ...

diff --combined Documentation/kernel-parameters.txt
index cd6f464,5389acf..256a216
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -763,11 -763,11 +763,11 @@@ and is between 256 and 4096 characters
                        Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]
  
        ide=            [HW] (E)IDE subsystem
 -                      Format: ide=nodma or ide=doubler or ide=reverse
 +                      Format: ide=nodma or ide=doubler
                        See Documentation/ide/ide.txt.
  
        ide?=           [HW] (E)IDE subsystem
 -                      Format: ide?=noprobe or chipset specific parameters.
 +                      Format: ide?=ata66 or chipset specific parameters.
                        See Documentation/ide/ide.txt.
  
        idebus=         [HW] (E)IDE subsystem - VLB/PCI bus speed
@@@ -812,19 -812,6 +812,19 @@@
  
        inttest=        [IA64]
  
 +      iommu=          [x86]
 +              off
 +              force
 +              noforce
 +              biomerge
 +              panic
 +              nopanic
 +              merge
 +              nomerge
 +              forcesac
 +              soft
 +
 +
        intel_iommu=    [DMAR] Intel IOMMU driver (DMAR) option
                off
                        Disable intel iommu driver.
@@@ -941,11 -928,6 +941,11 @@@
        kstack=N        [X86-32,X86-64] Print N words from the kernel stack
                        in oops dumps.
  
 +      kgdboc=         [HW] kgdb over consoles.
 +                      Requires a tty driver that supports console polling.
 +                      (only serial suported for now)
 +                      Format: <serial_device>[,baud]
 +
        l2cr=           [PPC]
  
        lapic           [X86-32,APIC] Enable the local APIC even if BIOS
@@@ -1152,11 -1134,6 +1152,11 @@@
                                 or
                                 memmap=0x10000$0x18690000
  
 +      memtest=        [KNL,X86_64] Enable memtest
 +                      Format: <integer>
 +                      range: 0,4 : pattern number
 +                      default : 0 <disable>
 +
        meye.*=         [HW] Set MotionEye Camera parameters
                        See Documentation/video4linux/meye.txt.
  
@@@ -1362,6 -1339,10 +1362,10 @@@
  
        nowb            [ARM]
  
+       nptcg=          [IA64] Override max number of concurrent global TLB
+                       purges which is reported from either PAL_VM_SUMMARY or
+                       SAL PALO.
+ 
        numa_zonelist_order= [KNL, BOOT] Select zonelist order for NUMA.
                        one of ['zone', 'node', 'default'] can be specified
                        This can be set from sysctl after boot.