diff --git a/[refs] b/[refs] index d5a4de2ecdd9..c3eaf4f9823d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e97b28309edc5669ced2bb1371704e8f8d084e3 +refs/heads/master: 2cfed60cc24676d65e01278dbf10d0069de02592 diff --git a/trunk/.gitignore b/trunk/.gitignore index fdcce40226d7..3016ed30526d 100644 --- a/trunk/.gitignore +++ b/trunk/.gitignore @@ -27,6 +27,7 @@ TAGS vmlinux* !vmlinux.lds.S System.map +Module.markers Module.symvers !.gitignore diff --git a/trunk/arch/x86/boot/.gitignore b/trunk/arch/x86/boot/.gitignore index b1bdc4c6f9f2..172cf8a98bdd 100644 --- a/trunk/arch/x86/boot/.gitignore +++ b/trunk/arch/x86/boot/.gitignore @@ -1,7 +1,8 @@ bootsect bzImage +cpustr.h +mkcpustr +offsets.h setup setup.bin setup.elf -cpustr.h -mkcpustr diff --git a/trunk/arch/x86/kernel/acpi/realmode/.gitignore b/trunk/arch/x86/kernel/acpi/realmode/.gitignore new file mode 100644 index 000000000000..58f1f48a58f8 --- /dev/null +++ b/trunk/arch/x86/kernel/acpi/realmode/.gitignore @@ -0,0 +1,3 @@ +wakeup.bin +wakeup.elf +wakeup.lds