/* * Copyright (C) 2014 Linaro Ltd. * * Author: Ulf Hansson * License terms: GNU General Public License (GPL) version 2 */ #ifndef _DT_BINDINGS_ARM_UX500_PM_DOMAINS_H #define _DT_BINDINGS_ARM_UX500_PM_DOMAINS_H #define DOMAIN_VAPE 0 /* Number of PM domains. */ #define NR_DOMAINS (DOMAIN_VAPE + 1) #endif it.distanz.ch/linux/net-next.git' title='net-next.git Git repository'/>
summaryrefslogtreecommitdiff
path: root/include/sound/gus.h
916.h?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>qcom,gcc-msm8916.h
diff options
AgeCommit message (Expand)AuthorFilesLines
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch)
treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /include/dt-bindings/reset/qcom,gcc-msm8916.h
parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)
parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/dt-bindings/reset/qcom,gcc-msm8916.h')