diff --git a/[refs] b/[refs] index ae139e054539..a67e63df3617 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec2e1ed2d7f703ee5dfc9bff501bf0ccb70ab23b +refs/heads/master: 19feb61e9956270e1be47250ace881ebbe130b8e diff --git a/trunk/Documentation/dontdiff b/trunk/Documentation/dontdiff index b4a898f43c37..3af5ad473858 100644 --- a/trunk/Documentation/dontdiff +++ b/trunk/Documentation/dontdiff @@ -163,7 +163,6 @@ mach-types.h machtypes.h map map_hugetlb -maui_boot.h media mconf miboot* diff --git a/trunk/sound/oss/.gitignore b/trunk/sound/oss/.gitignore index 7efb12b45502..12a3920d6fb6 100644 --- a/trunk/sound/oss/.gitignore +++ b/trunk/sound/oss/.gitignore @@ -1,4 +1,3 @@ #Ignore generated files -maui_boot.h pss_boot.h trix_boot.h