diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-07-28 16:51:02 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-07-28 16:51:02 +0200 |
| commit | 4fd1f229c2bc39b7f35f2a9f9fb9892f2d665359 (patch) | |
| tree | 42ec16964cd95870504dff19c3893b6f4d37b897 /include/linux/timerqueue.h | |
| parent | Merge tag 'v3.17-rockchip-rk3xxx-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt (diff) | |
| parent | ARM: mvebu: Add dts definition for Lenovo Iomega ix4-300d NAS (diff) | |
Merge tag 'mvebu-dt-3.17-4' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu DT changes for v3.17 (round 4)" from Jason Cooper"
- Armada XP
- New board, Lenovo ix4-300d NAS
- Add Lenovo to vendor-prefixes
- Dove
- Add LCD controllers
* tag 'mvebu-dt-3.17-4' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Add dts definition for Lenovo Iomega ix4-300d NAS
of: Add Lenovo Group Ltd. to the vendor-prefixes list.
ARM: dts: dove: add DT LCD controllers
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions