summaryrefslogtreecommitdiff
path: root/include/soc/at91
ModeNameSize
-rw-r--r--at91sam9_ddrsdr.h6205logplain
-rw-r--r--at91sam9_sdramc.h3769logplain
-rw-r--r--atmel-secumod.h564logplain
-rw-r--r--atmel-sfr.h1030logplain
a70d78f218e4c9276b0bac0545e5184c1c47b'>f4abe2f05e173023d2a262afd4aebb1e89fe6985 /include/dt-bindings/reset/qcom,mmcc-msm8960.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,mmcc-msm8960.h')