diff options
author | Olof Johansson <olof@lixom.net> | 2014-03-09 06:56:31 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-03-09 06:56:31 (GMT) |
commit | 10554647b488f58f2c36c78368e9bab4b93da721 (patch) | |
tree | 007c561cd1390fc71fe23d0596849901cd9d5c47 /lib/timerqueue.c | |
parent | 4058f76247b29978352339fb6278bed796dd210f (diff) | |
parent | ae41a3030ce8901853b3cfd5e118a4b0288aa068 (diff) | |
download | linux-10554647b488f58f2c36c78368e9bab4b93da721.tar.xz |
Merge tag 'omap-for-v3.14/fixes-dt-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren:
Two omap3430 vs 3630 device tree regression fixes for
issues booting 3430 based boards.
* tag 'omap-for-v3.14/fixes-dt-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: omap3-gta04: Add ti,omap36xx to compatible property to avoid problems with booting
ARM: dts: omap3-igep: fix boot fail due wrong compatible match
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'lib/timerqueue.c')
0 files changed, 0 insertions, 0 deletions