tree 0a6a48608ed45ab68f1a56f80f392db4746a7e18
parent 6f0c0580b70c89094b3422ba81118c7b959c7556
parent 790440bc90fa800ff2a4b8b5046227a2ca32c1b1
author Arnd Bergmann <arnd@arndb.de> 1351258180 +0200
committer Arnd Bergmann <arnd@arndb.de> 1351258180 +0200

Merge branch 'vexpress-drivers' of git://git.linaro.org/people/pawelmoll/linux into next/drivers

Versatile Express changes from Pawel Moll <pawel.moll@arm.com>:

* 'vexpress-drivers' of git://git.linaro.org/people/pawelmoll/linux:
  ARM: vexpress: Reset driver
  hwmon: Versatile Express hwmon driver

Signed-off-by: Arnd Bergmann <arnd@arndb.de>