aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi/drm/i915_drm.h
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-10-26 14:35:41 +0900
committerOlof Johansson <olof@lixom.net>2015-10-26 14:35:41 +0900
commitd3dc3df6330e4b4d799bef4aac6f934b5e726b1c (patch)
treef359071efe5508a4fc8bc593ea646c6422c648ce /include/uapi/drm/i915_drm.h
parentMerge tag 'pxa-for-4.4' of https://github.com/rjarzmik/linux into next/cleanup (diff)
parentMerge tag 'for-v4.4/omap-hwmod-cleanup-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v4.4/soc (diff)
downloadlinux-dev-d3dc3df6330e4b4d799bef4aac6f934b5e726b1c.tar.xz
linux-dev-d3dc3df6330e4b4d799bef4aac6f934b5e726b1c.zip
Merge tag 'omap-for-v4.4/soc-clean-up' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
Minimal omap SoC changes for v4.4 merge window. As we've spent quite a bit of time sorting out regressions for v4.3 and are very late with these, I've kept the changes down to minimum: - A series of timer changes from Felipe Balbi to get us closer to moving the remaining timer code into drivers - A series of hwmod clean-up changes queued by Paul Walmsley - SoC detection clean-up to use soc_is instead of cpu_is as CPU is within the SoC and is confusing naming. The rest we can now change along with the other clean-up * tag 'omap-for-v4.4/soc-clean-up' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (21 commits) ARM: OMAP3: hwmod data: Remove legacy mailbox data and addrs ARM: DRA7: hwmod data: Remove spinlock hwmod addrs ARM: OMAP4: hwmod data: Remove spinlock hwmod addrs ARM: DRA7/AM335x/AM437x: hwmod: Remove gpmc address space from hwmod data arm: omap2: board-generic: use omap4_local_timer_init for AM437x ARM: DRA7/AM335x/AM437x: hwmod: Remove elm address space from hwmod data ARM: OMAP: Remove duplicated operand in OR operation clocksource: ti-32k: make it depend on GENERIC_CLOCKSOURCE ARM: OMAP: Change all cpu_is_* occurences to soc_is_* for id.c ARM: OMAP2+: Rename cpu_is macros to soc_is arm: omap2: timer: limit hwmod usage to non-DT boots arm: omap2+: select 32k clocksource driver clocksource: add TI 32.768 Hz counter driver arm: omap2: timer: rename omap_sync32k_timer_init() arm: omap2: timer: always call clocksource_of_init() when DT arm: omap2: timer: move realtime_counter_init() around arm: omap2: timer: provide generic sync32k_timer_init function arm: omap2: timer: remove __omap_gptimer_init() arm: omap2: timer: add a gptimer argument to sync32k_timer_init() arm: omap2: timer: get rid of obfuscating macros ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/uapi/drm/i915_drm.h')
0 files changed, 0 insertions, 0 deletions