diff options
author | Michal Marek <mmarek@suse.cz> | 2013-02-25 21:50:05 +0100 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2013-02-25 21:51:57 +0100 |
commit | e3900e74f26fc924c8e9e2a922bd40369b0bb517 (patch) | |
tree | 6e868575d346032ba9408f350c6e5369e0e52b0d /Documentation/dontdiff | |
parent | 62dc989921df2a98d1a73aacd085abe941cb9828 (diff) | |
parent | 02f3e53a131c8aa3fe3c954058f1add5beeae621 (diff) | |
download | blackbird-obmc-linux-e3900e74f26fc924c8e9e2a922bd40369b0bb517.tar.gz blackbird-obmc-linux-e3900e74f26fc924c8e9e2a922bd40369b0bb517.zip |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
There is one kconfig fix in the rc-fixes branch that I forgot to submit
for 3.8, so let's add it to the kconfig branch for 3.9-rc1.
Diffstat (limited to 'Documentation/dontdiff')
-rw-r--r-- | Documentation/dontdiff | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff index 74c25c8d8884..b89a739a3276 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff @@ -181,7 +181,6 @@ modversions.h* nconf ncscope.* offset.h -offsets.h oui.c* page-types parse.c |