summaryrefslogtreecommitdiff
path: root/scripts/kconfig/conf.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-19 06:36:08 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-19 06:36:08 -0800
commit0a191749ce19112f8f20675232b951dccd4ae00e (patch)
treeb81540374236beb22d50daaa856910257c0e6e2d /scripts/kconfig/conf.c
parentc765a6dfad10b857e9681d7c4dec375ebe78db8a (diff)
parentaccb884b32e82f943340688c9cd30290531e73e0 (diff)
Merge branch 'char-misc-linus' into char-misc-next
We want the mei change here to allow future mei patches to apply properly. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/kconfig/conf.c')
0 files changed, 0 insertions, 0 deletions