History log of /linux/arch/x86/kernel/.gitignore (Results 26 – 50 of 51)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 9063974c 23-Jul-2008 Jiri Kosina <jkosina@suse.cz>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# 908cf4b9 21-Jul-2008 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next


# 0679c2f4 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into pci-for-jesse


# f6dc8cca 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# 9b610fda 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into timers/nohz


# f1b0c8d3 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/amd-iommu


# cdbfc557 18-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/cleanups


# 49997d75 18-Jul-2008 David S. Miller <davem@davemloft.net>

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-m

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c

show more ...


# 82638844 16-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into cpus4096

Conflicts:

arch/x86/xen/smp.c
kernel/sched_rt.c
net/iucv/iucv.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# 1e094813 15-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/softlockup

Conflicts:

kernel/softlockup.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# 0c17e4ce 15-Jul-2008 Ben Dooks <ben-linux@fluff.org>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-rmk


# 91d0322b 15-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/urgent


# 2fceef39 14-Jul-2008 Jonathan Corbet <corbet@lwn.net>

Merge commit 'v2.6.26' into bkl-removal


# b4ba0ba2 14-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.26' into core/locking


# 11c2d817 14-Jul-2008 Benjamin Herrenschmidt <benh@kernel.crashing.org>

Merge commit 'origin/HEAD' into test-merge

Manual fixup of include/asm-powerpc/pgtable-ppc64.h


# 54ef76f3 13-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into sched/devel


# ae94b807 12-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into x86/core

Conflicts:

arch/x86/mm/ioremap.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# a8931ef3 11-Jul-2008 David Woodhouse <David.Woodhouse@intel.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# 0306d5ef 11-Jul-2008 Neil Brown <neilb@suse.de>

Merge branch 'master' into for-next


# 0c81b2a1 11-Jul-2008 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/rcu

Conflicts:

include/linux/rculist.h
kernel/rcupreempt.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>


# b10e9ad0 10-Jul-2008 Daniel Guilak <guilak@linux.vnet.ibm.com>

arch/x86/kernel/.gitignore: Added vmlinux.lds to .gitignore file because it shouldn't be tracked.

Signed-off-by: Daniel Guilak <daniel@danielguilak.com>
Signed-off-by: Linus Torvalds <torvalds@linux

arch/x86/kernel/.gitignore: Added vmlinux.lds to .gitignore file because it shouldn't be tracked.

Signed-off-by: Daniel Guilak <daniel@danielguilak.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

show more ...


Revision tags: v2.6.26-rc9, v2.6.26-rc8, v2.6.26-rc7, v2.6.26-rc6, v2.6.26-rc5, v2.6.26-rc4, v2.6.26-rc3, v2.6.26-rc2, v2.6.26-rc1, v2.6.25, v2.6.25-rc9, v2.6.25-rc8, v2.6.25-rc7, v2.6.25-rc6, v2.6.25-rc5, v2.6.25-rc4, v2.6.25-rc3, v2.6.25-rc2, v2.6.25-rc1, v2.6.24, v2.6.24-rc8, v2.6.24-rc7, v2.6.24-rc6, v2.6.24-rc5, v2.6.24-rc4, v2.6.24-rc3, v2.6.24-rc2, v2.6.24-rc1
# d20ead9e 17-Oct-2007 Linus Torvalds <torvalds@woody.linux-foundation.org>

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86

* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (114 commits)
x86: delete vsyscall files during mak

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86

* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (114 commits)
x86: delete vsyscall files during make clean
kbuild: fix typo SRCARCH in find_sources
x86: fix kernel rebuild due to vsyscall fallout
.gitignore update for x86 arch
x86: unify include/asm/debugreg_32/64.h
x86: unify include/asm/unwind_32/64.h
x86: unify include/asm/types_32/64.h
x86: unify include/asm/tlb_32/64.h
x86: unify include/asm/siginfo_32/64.h
x86: unify include/asm/bug_32/64.h
x86: unify include/asm/mman_32/64.h
x86: unify include/asm/agp_32/64.h
x86: unify include/asm/kdebug_32/64.h
x86: unify include/asm/ioctls_32/64.h
x86: unify include/asm/floppy_32/64.h
x86: apply missing DMA/OOM prevention to floppy_32.h
x86: unify include/asm/cache_32/64.h
x86: unify include/asm/cache_32/64.h
x86: unify include/asm/dmi_32/64.h
x86: unify include/asm/delay_32/64.h
...

show more ...


# 9e447a7f 16-Oct-2007 Denis V. Lunev <den@openvz.org>

.gitignore update for x86 arch

This patch:
- makes .gitignore files visible to git
- makes arch/x86/kernel/vsyscall_32.lds and arch/i386/boot invisible

Signed-off-by: Denis V. Lunev <den@openvz.org

.gitignore update for x86 arch

This patch:
- makes .gitignore files visible to git
- makes arch/x86/kernel/vsyscall_32.lds and arch/i386/boot invisible

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

show more ...


# ebf8889b 13-Oct-2007 David Woodhouse <dwmw2@infradead.org>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# b981d8b3 13-Oct-2007 Dmitry Torokhov <dmitry.torokhov@gmail.com>

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

drivers/macintosh/adbhid.c


123