aboutsummaryrefslogtreecommitdiff
path: root/drivers/misc/vexpress/Kconfig
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2013-05-03 14:24:48 +0100
committerJon Medhurst <tixy@linaro.org>2013-05-03 14:24:48 +0100
commit8417d689429075fe59d92af4036e25424b13ea9c (patch)
treef0d341e6eae1cd5c4ca6180aeb29a00e21ff8a8e /drivers/misc/vexpress/Kconfig
parent83e4a8b0fe64a97fc92f436c7eff09569352c5ed (diff)
parentcee7bd6c72b15e357eb375a178532851c72e789c (diff)
downloadvexpress-lsk-8417d689429075fe59d92af4036e25424b13ea9c.tar.gz
Merge branch 'tracking-armlt-arm64' into integration-linux-vexpresstracking-integration-linux-vexpress-lsk-20130505.0
Conflicts: drivers/clk/versatile/Makefile
Diffstat (limited to 'drivers/misc/vexpress/Kconfig')
0 files changed, 0 insertions, 0 deletions