summaryrefslogtreecommitdiff
path: root/Documentation/dontdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-03-04 13:51:29 +0300
committerIngo Molnar <mingo@elte.hu>2010-03-04 13:51:29 +0300
commite02c4fd3142dfb9412531bbfabd510a2a7c6ea46 (patch)
tree61b64506b2c016e050f940a89d1ffd36b7c00fdf /Documentation/dontdiff
parentae1f30384baef4056438d81b305a6a5199b0d16c (diff)
parentac91d85456372a90af5b85eb6620fd2efb1e431b (diff)
downloadlinux-e02c4fd3142dfb9412531bbfabd510a2a7c6ea46.tar.xz
Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'Documentation/dontdiff')
-rw-r--r--Documentation/dontdiff1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index 3ad6acead949..d9bcffd59433 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -69,7 +69,6 @@ av_permissions.h
bbootsect
bin2c
binkernel.spec
-binoffset
bootsect
bounds.h
bsetup