Merge tag 'ux500-v4.2-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
authorArnd Bergmann <arnd@arndb.de>
Wed, 13 May 2015 11:37:26 +0000 (13:37 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 13 May 2015 11:37:26 +0000 (13:37 +0200)
Merge "Ux500 Device Tree changes for the v4.2 series" form Linus Walleij:

Define CPU topology, connect that with CoreSight blocks,
add sensor information to DT boards.

* tag 'ux500-v4.2-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: add the sensors to the STUIB board
  ARM: ux500: assign the sensor trigger IRQs
  ARM: ux500: fix lsm303dlh magnetometer compat string
  ARM: ux500: add CoreSight blocks to DTS file
  ARM: ux500: define CPU topology

1  2 
arch/arm/boot/dts/ste-dbx5x0.dtsi
arch/arm/boot/dts/ste-snowball.dts

Simple merge
Simple merge