diff --git a/[refs] b/[refs] index f6876a924bd7..3e669d40b86d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21ebddd3efd3aff961153f1bac4793218dfaea9c +refs/heads/master: 9e447a7f1fd997bcb9266899e777c37469245365 diff --git a/trunk/.gitignore b/trunk/.gitignore index 27c3e839b54e..22fb8fa9bc3d 100644 --- a/trunk/.gitignore +++ b/trunk/.gitignore @@ -26,6 +26,7 @@ vmlinux* !vmlinux.lds.S System.map Module.symvers +!.gitignore # # Generated include files diff --git a/trunk/arch/i386/.gitignore b/trunk/arch/i386/.gitignore new file mode 100644 index 000000000000..36ef4c374d25 --- /dev/null +++ b/trunk/arch/i386/.gitignore @@ -0,0 +1 @@ +boot diff --git a/trunk/arch/x86/kernel/.gitignore b/trunk/arch/x86/kernel/.gitignore index 40836ad9079c..4ea38a39aed4 100644 --- a/trunk/arch/x86/kernel/.gitignore +++ b/trunk/arch/x86/kernel/.gitignore @@ -1 +1,2 @@ vsyscall.lds +vsyscall_32.lds