Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (103 commits)
  powerpc: Fix bug in move of altivec code to vector.S
  powerpc: Add support for swiotlb on 32-bit
  powerpc/spufs: Remove unused error path
  powerpc: Fix warning when printing a resource_size_t
  powerpc/xmon: Remove unused variable in xmon.c
  powerpc/pseries: Fix warnings when printing resource_size_t
  powerpc: Shield code specific to 64-bit server processors
  powerpc: Separate PACA fields for server CPUs
  powerpc: Split exception handling out of head_64.S
  powerpc: Introduce CONFIG_PPC_BOOK3S
  powerpc: Move VMX and VSX asm code to vector.S
  powerpc: Set init_bootmem_done on NUMA platforms as well
  powerpc/mm: Fix a AB->BA deadlock scenario with nohash MMU context lock
  powerpc/mm: Fix some SMP issues with MMU context handling
  powerpc: Add PTRACE_SINGLEBLOCK support
  fbdev: Add PLB support and cleanup DCR in xilinxfb driver.
  powerpc/virtex: Add ml510 reference design device tree
  powerpc/virtex: Add Xilinx ML510 reference design support
  powerpc/virtex: refactor intc driver and add support for i8259 cascading
  powerpc/virtex: Add support for Xilinx PCI host bridge
  ...

diff --combined Documentation/kernel-parameters.txt
index 5f66ba295c5d376599e6942b4f917ad38d9dab9e,f93c6336e6891a5b048eb787364e8150f326ebb5..ad38006307725ff2a563d9e86e78230df0879e22
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -491,6 -491,13 +491,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
@@@ -887,8 -894,11 +894,8 @@@
  
        ide-core.nodma= [HW] (E)IDE subsystem
                        Format: =0.0 to prevent dma on hda, =0.1 hdb =1.0 hdc
 -                      .vlb_clock .pci_clock .noflush .noprobe .nowerr .cdrom
 -                      .chs .ignore_cable are additional options
 -                      See Documentation/ide/ide.txt.
 -
 -      idebus=         [HW] (E)IDE subsystem - VLB/PCI bus speed
 +                      .vlb_clock .pci_clock .noflush .nohpa .noprobe .nowerr
 +                      .cdrom .chs .ignore_cable are additional options
                        See Documentation/ide/ide.txt.
  
        ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem
@@@ -1073,7 -1083,7 +1080,7 @@@
  
        kgdboc=         [HW] kgdb over consoles.
                        Requires a tty driver that supports console polling.
 -                      (only serial suported for now)
 +                      (only serial supported for now)
                        Format: <serial_device>[,baud]
  
        kmac=           [MIPS] korina ethernet MAC address.
@@@ -1402,7 -1412,7 +1409,7 @@@
                        ('y', default) or cooked coordinates ('n')
  
        mtrr_chunk_size=nn[KMG] [X86]
 -                      used for mtrr cleanup. It is largest continous chunk
 +                      used for mtrr cleanup. It is largest continuous chunk
                        that could hold holes aka. UC entries.
  
        mtrr_gran_size=nn[KMG] [X86]

diff --combined include/linux/pci_ids.h
index 9f36e1cdbf01c4016b1e21ba4d40a83fe5b43cc6,d77c23779c6700dcafec121b34f43c25191537e0..a3df4a2bba6333f7853f971516310d3e7dfe1892
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -1005,7 -1005,6 +1005,7 @@@
  #define PCI_DEVICE_ID_PLX_PCI200SYN   0x3196
  #define PCI_DEVICE_ID_PLX_9030          0x9030
  #define PCI_DEVICE_ID_PLX_9050                0x9050
 +#define PCI_DEVICE_ID_PLX_9056                0x9056
  #define PCI_DEVICE_ID_PLX_9080                0x9080
  #define PCI_DEVICE_ID_PLX_GTEK_SERIAL2        0xa001
  
@@@ -1315,13 -1314,6 +1315,13 @@@
  
  #define PCI_VENDOR_ID_CREATIVE                0x1102 /* duplicate: ECTIVA */
  #define PCI_DEVICE_ID_CREATIVE_EMU10K1        0x0002
 +#define PCI_DEVICE_ID_CREATIVE_20K1   0x0005
 +#define PCI_DEVICE_ID_CREATIVE_20K2   0x000b
 +#define PCI_SUBDEVICE_ID_CREATIVE_SB0760      0x0024
 +#define PCI_SUBDEVICE_ID_CREATIVE_SB08801     0x0041
 +#define PCI_SUBDEVICE_ID_CREATIVE_SB08802     0x0042
 +#define PCI_SUBDEVICE_ID_CREATIVE_SB08803     0x0043
 +#define PCI_SUBDEVICE_ID_CREATIVE_HENDRIX     0x6000
  
  #define PCI_VENDOR_ID_ECTIVA          0x1102 /* duplicate: CREATIVE */
  #define PCI_DEVICE_ID_ECTIVA_EV1938   0x8938
@@@ -1855,10 -1847,6 +1855,10 @@@
  #define PCI_SUBDEVICE_ID_HYPERCOPE_METRO      0x0107
  #define PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2     0x0108
  
 +#define PCI_VENDOR_ID_DIGIGRAM                0x1369
 +#define PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_SERIAL_SUBSYSTEM   0xc001
 +#define PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_CAE_SERIAL_SUBSYSTEM       0xc002
 +
  #define PCI_VENDOR_ID_KAWASAKI                0x136b
  #define PCI_DEVICE_ID_MCHIP_KL5A72002 0xff01
  
@@@ -2127,7 -2115,6 +2127,7 @@@
  #define PCI_VENDOR_ID_MAINPINE                0x1522
  #define PCI_DEVICE_ID_MAINPINE_PBRIDGE        0x0100
  #define PCI_VENDOR_ID_ENE             0x1524
 +#define PCI_DEVICE_ID_ENE_CB710_FLASH 0x0510
  #define PCI_DEVICE_ID_ENE_CB712_SD    0x0550
  #define PCI_DEVICE_ID_ENE_CB712_SD_2  0x0551
  #define PCI_DEVICE_ID_ENE_CB714_SD    0x0750
@@@ -2289,6 -2276,8 +2289,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
@@@ -2301,6 -2290,8 +2303,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