From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 15 May 2015 15:18:57 +0000 (+0200)
Subject: Merge tag 'pxa-dt-4.2' of https://github.com/rjarzmik/linux into next/dt
X-Git-Tag: firefly_0821_release~176^2~1556^2~42
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=144ed9708e67d28b116f4cd9e3106c08341a8959;p=firefly-linux-kernel-4.4.55.git

Merge tag 'pxa-dt-4.2' of https://github.com/rjarzmik/linux into next/dt

Merge "device-tree pxa update" from Robert Jarzmik:

 - clocks descriptions (pxa27x, pxa3xx)
 - timer descriptions (pxa27x, pxa3xx)
 - IPs which are embedded on the SoC
   - keypad
   - udc (USB client)
   - power I2C

These are amongst the building blocks for future pxa device-tree board
description.

* tag 'pxa-dt-4.2' of https://github.com/rjarzmik/linux:
  ARM: dts: pxa: add pxa-timer to pxa27x and pxa3xx
  ARM: dts: pxa: add pxa27x-keypad to pxa27x
  ARM: dts: pxa: add pxa27x-udc to pxa27x
  ARM: dts: pxa: add clocks
  ARM: dts: pxa: add pwri2c to pxa device-tree
---

144ed9708e67d28b116f4cd9e3106c08341a8959