Merge remote-tracking branch 'galak/next'

diff --cc arch/powerpc/platforms/85xx/p1022_ds.c
index c01c7277888c1e3655fddd6be2dfe2da21705182,6a0b9731b25988488c20dccd8c460e2b9b29e3cc..fda15716fada03eb80cbc0a4761b55a6dffbe47c
--- 1/arch/powerpc/platforms/85xx/p1022_ds.c
--- 2/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@@ -127,9 -126,9 +127,9 @@@ static void p1022ds_set_gamma_table(enu
   * p1022ds_set_monitor_port: switch the output to a different monitor port
   *
   */
 -static void p1022ds_set_monitor_port(int monitor_port)
 +static void p1022ds_set_monitor_port(enum fsl_diu_monitor_port port)
  {
-       struct device_node *pixis_node;
+       struct device_node *np;
        void __iomem *pixis;
        u8 __iomem *brdcfg1;