Merge branch 'merge' into next

diff --combined Documentation/kernel-parameters.txt
index 844e9a654d0b084ab6d9ed82e8de9b67e3f255d8,fd5cac013037defc68c3ef118ed70b476debee71..779160afa351b67003fd49993514c215167fddad
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -497,13 -497,6 +497,13 @@@ and is between 256 and 4096 characters
                        Also note the kernel might malfunction if you disable
                        some critical bits.
  
 +      cmo_free_hint=  [PPC] Format: { yes | no }
 +                      Specify whether pages are marked as being inactive
 +                      when they are freed.  This is used in CMO environments
 +                      to determine OS memory pressure for page stealing by
 +                      a hypervisor.
 +                      Default: yes
 +
        code_bytes      [X86] How many bytes of object code to print
                        in an oops report.
                        Range: 0 - 8192
@@@ -1542,6 -1535,10 +1542,10 @@@
                        register save and restore. The kernel will only save
                        legacy floating-point registers on task switch.
  
+       noxsave         [BUGS=X86] Disables x86 extended register state save
+                       and restore using xsave. The kernel will fallback to
+                       enabling legacy floating-point and sse state.
+ 
        nohlt           [BUGS=ARM,SH] Tells the kernel that the sleep(SH) or
                        wfi(ARM) instruction doesn't work correctly and not to
                        use it. This is also useful when using JTAG debugger.

diff --combined arch/powerpc/Kconfig
index 7b67895fccf6d4495080e4d98d02da6d0b0efe49,cdc9a6ff4be823a356521e00b7d35eb15b28e013..ff755398ce28ae000496850a2e333fd7b04c1671
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -42,10 -42,6 +42,10 @@@ config GENERIC_HARDIRQ
        bool
        default y
  
 +config GENERIC_HARDIRQS_NO__DO_IRQ
 +      bool
 +      default y
 +
  config HAVE_SETUP_PER_CPU_AREA
        def_bool PPC64
  
@@@ -872,6 -868,18 +872,18 @@@ config TASK_SIZ
        default "0x80000000" if PPC_PREP || PPC_8xx
        default "0xc0000000"
  
+ config CONSISTENT_SIZE_BOOL
+       bool "Set custom consistent memory pool size"
+       depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE
+       help
+         This option allows you to set the size of the
+         consistent memory pool.  This pool of virtual memory
+         is used to make consistent memory allocations.
+ 
+ config CONSISTENT_SIZE
+       hex "Size of consistent memory pool" if CONSISTENT_SIZE_BOOL
+       default "0x00200000" if NOT_COHERENT_CACHE
+ 
  config PIN_TLB
        bool "Pinned Kernel TLBs (860 ONLY)"
        depends on ADVANCED_OPTIONS && 8xx

diff --combined include/linux/pci_ids.h
index bfa0402d34341d4607f4b491750cad30c5ca7b02,0f71812d67d327283b551d2a3c84b762fa2617b4..b6ab381748c58850197173c234c3a4fb5467fc0b
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -1406,7 -1406,7 +1406,7 @@@
  #define PCI_DEVICE_ID_VIA_82C598_1    0x8598
  #define PCI_DEVICE_ID_VIA_838X_1      0xB188
  #define PCI_DEVICE_ID_VIA_83_87XX_1   0xB198
- #define PCI_DEVICE_ID_VIA_C409_IDE    0XC409
+ #define PCI_DEVICE_ID_VIA_VX855_IDE   0xC409
  #define PCI_DEVICE_ID_VIA_ANON                0xFFFF
  
  #define PCI_VENDOR_ID_SIEMENS           0x110A
@@@ -2274,8 -2274,6 +2274,8 @@@
  #define PCI_DEVICE_ID_MPC8547E                0x0018
  #define PCI_DEVICE_ID_MPC8545E                0x0019
  #define PCI_DEVICE_ID_MPC8545         0x001a
 +#define PCI_DEVICE_ID_MPC8569E                0x0061
 +#define PCI_DEVICE_ID_MPC8569         0x0060
  #define PCI_DEVICE_ID_MPC8568E                0x0020
  #define PCI_DEVICE_ID_MPC8568         0x0021
  #define PCI_DEVICE_ID_MPC8567E                0x0022
@@@ -2288,8 -2286,6 +2288,8 @@@
  #define PCI_DEVICE_ID_MPC8572         0x0041
  #define PCI_DEVICE_ID_MPC8536E                0x0050
  #define PCI_DEVICE_ID_MPC8536         0x0051
 +#define PCI_DEVICE_ID_P2020E          0x0070
 +#define PCI_DEVICE_ID_P2020           0x0071
  #define PCI_DEVICE_ID_MPC8641         0x7010
  #define PCI_DEVICE_ID_MPC8641D                0x7011
  #define PCI_DEVICE_ID_MPC8610         0x7018