aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/vlynq/Kconfig
diff options
context:
space:
mode:
authorH. Nikolaus Schaller <hns@goldelico.com>2013-09-12 09:22:27 +0200
committerH. Nikolaus Schaller <hns@goldelico.com>2013-09-12 09:22:27 +0200
commit2ac80fc07a1479389f3d1a71fa6a230dd1153b63 (patch)
tree071dd7595411caa58e9214e3a811ec304b1d707e /drivers/vlynq/Kconfig
parent7953083a0bc0b7e4887630e1330db88f42674836 (diff)
parentd5d04bb48f0eb89c14e76779bb46212494de0bec (diff)
downloadkernel_goldelico_gta04-2ac80fc07a1479389f3d1a71fa6a230dd1153b63.zip
kernel_goldelico_gta04-2ac80fc07a1479389f3d1a71fa6a230dd1153b63.tar.gz
kernel_goldelico_gta04-2ac80fc07a1479389f3d1a71fa6a230dd1153b63.tar.bz2
fixed merge conflicts
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Diffstat (limited to 'drivers/vlynq/Kconfig')
0 files changed, 0 insertions, 0 deletions