summaryrefslogtreecommitdiff
path: root/drivers/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-01-23 07:31:34 (GMT)
committerTakashi Iwai <tiwai@suse.de>2013-01-23 07:31:34 (GMT)
commite152f18027552eb34006b35347e72bc805783027 (patch)
treeac9765e68597c08c24de447f46bb3e04d9881e1b /drivers/Kconfig
parent49ba4f94bddb7f5272c4596d505f94355cc3fbd2 (diff)
parent42c364ace52ae6b4699105b39f2559c256b6cd4c (diff)
downloadlinux-fsl-qoriq-e152f18027552eb34006b35347e72bc805783027.tar.xz
Merge branch 'for-linus' into for-next
This is a preliminary merge before the upcoming merge of generic parser branch.
Diffstat (limited to 'drivers/Kconfig')
0 files changed, 0 insertions, 0 deletions