Merge remote-tracking branch 'drm/drm-next'

Conflicts:
	include/linux/pci_regs.h

diff --cc drivers/gpu/drm/gma500/psb_drv.c
Simple merge

diff --cc include/linux/pci_regs.h
index 53274bff577323c8c038ade2850f8756f73827ef,7f04132eb02dfc4060c66403e563ab675cd39bdb..7fb75b143755c6a2b4e0105cd9d23511196fb8eb
--- 1/include/linux/pci_regs.h
--- 2/include/linux/pci_regs.h
+++ b/include/linux/pci_regs.h
@@@ -542,7 -521,11 +542,12 @@@
  #define  PCI_EXP_OBFF_MSGA_EN 0x2000  /* OBFF enable with Message type A */
  #define  PCI_EXP_OBFF_MSGB_EN 0x4000  /* OBFF enable with Message type B */
  #define  PCI_EXP_OBFF_WAKE_EN 0x6000  /* OBFF using WAKE# signaling */
 +#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2        44      /* v2 endpoints end here */
+ #define PCI_EXP_LNKCAP2               44      /* Link Capability 2 */
+ #define  PCI_EXP_LNKCAP2_SLS_2_5GB 0x01       /* Current Link Speed 2.5GT/s */
+ #define  PCI_EXP_LNKCAP2_SLS_5_0GB 0x02       /* Current Link Speed 5.0GT/s */
+ #define  PCI_EXP_LNKCAP2_SLS_8_0GB 0x04       /* Current Link Speed 8.0GT/s */
+ #define  PCI_EXP_LNKCAP2_CROSSLINK 0x100 /* Crosslink supported */
  #define PCI_EXP_LNKCTL2               48      /* Link Control 2 */
  #define PCI_EXP_SLTCTL2               56      /* Slot Control 2 */