Merge branch 'linus'

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/bus/arm-cci.c
Simple merge

diff --cc drivers/bus/arm-ccn.c
index e0ad47534126cfa2fedb7814d351342713f9656d,884c0305e29033085ff4131434f29f07bd5d78ae..d1074d9b38ba163e624ea1b996df38ad2164f285
--- 1/drivers/bus/arm-ccn.c
--- 2/drivers/bus/arm-ccn.c
+++ b/drivers/bus/arm-ccn.c
@@@ -187,8 -187,12 +187,9 @@@ struct arm_ccn 
        struct arm_ccn_component *xp;
  
        struct arm_ccn_dt dt;
+       int mn_id;
  };
  
 -static DEFINE_MUTEX(arm_ccn_mutex);
 -static LIST_HEAD(arm_ccn_list);
 -
  static int arm_ccn_node_to_xp(int node)
  {
        return node / CCN_NUM_XP_PORTS;