From f940db1c07eeef2b3e5c197cfc7ef1b8bb808ef7 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Sun, 1 Jul 2012 15:42:50 +0200 Subject: [PATCH] --- yaml --- r: 343029 b: refs/heads/master c: 23e5047afc710357d36ba519acf0af5285c5c944 h: refs/heads/master i: 343027: 53f3ea0dbcaac2fa2582b5c211e1e29be30bc0fe v: v3 --- [refs] | 2 +- trunk/Documentation/dontdiff | 1 - trunk/arch/x86/boot/.gitignore | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 85a586679424..d4c62a896ea3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59dbaf0415136de6f1dfc38dd640dd6432739bfc +refs/heads/master: 23e5047afc710357d36ba519acf0af5285c5c944 diff --git a/trunk/Documentation/dontdiff b/trunk/Documentation/dontdiff index 74c25c8d8884..b89a739a3276 100644 --- a/trunk/Documentation/dontdiff +++ b/trunk/Documentation/dontdiff @@ -181,7 +181,6 @@ modversions.h* nconf ncscope.* offset.h -offsets.h oui.c* page-types parse.c diff --git a/trunk/arch/x86/boot/.gitignore b/trunk/arch/x86/boot/.gitignore index 851fe936d242..e3cf9f682be5 100644 --- a/trunk/arch/x86/boot/.gitignore +++ b/trunk/arch/x86/boot/.gitignore @@ -2,7 +2,6 @@ bootsect bzImage cpustr.h mkcpustr -offsets.h voffset.h zoffset.h setup