diff options
author | Michal Marek <mmarek@suse.cz> | 2010-08-04 14:05:07 +0200 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-08-04 14:05:07 +0200 |
commit | 7a996d3ab150bb0e1b71fa182f70199a703efdd1 (patch) | |
tree | 96a36947d90c9b96580899abd38cb3b70cd9d40b /Documentation/dontdiff | |
parent | 7cf3d73b4360e91b14326632ab1aeda4cb26308d (diff) | |
parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
download | op-kernel-dev-7a996d3ab150bb0e1b71fa182f70199a703efdd1.zip op-kernel-dev-7a996d3ab150bb0e1b71fa182f70199a703efdd1.tar.gz |
Merge commit 'v2.6.35' into kbuild/kconfig
Conflicts:
scripts/kconfig/Makefile
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 3ad6ace..d9bcffd 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff @@ -69,7 +69,6 @@ av_permissions.h bbootsect bin2c binkernel.spec -binoffset bootsect bounds.h bsetup |