Public Git Hosting - linux-2.6/x86.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 7ad529a 55f9c40)

commit	e55bb1afacc851420bf3cf81d123bf58419ab68b
author	Ingo Molnar <mingo@elte.hu>
	Fri, 29 Jul 2011 08:18:02 +0000 (29 10:18 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 29 Jul 2011 08:18:02 +0000 (29 10:18 +0200)
tree	7cdd90e406661a8148e5138f7004c3f0931ea5df	tree \| snapshot (tar.gz zip)
parent	7ad529a29587b0f2622c7bb76fccbf7b8f4bc96c	commit \| diff
parent	55f9c40ff632d03c527d6a6ceddcda0a224587a6	commit \| diff

Merge branch 'linus'

Conflicts:
drivers/net/Makefile
drivers/rtc/interface.c
kernel/gcov/Kconfig

17 files changed:

arch/x86/include/asm/spinlock.h	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/battery.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/ahci.c	diff1 \|	diff2 \|	blob \| history
drivers/base/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/futex.c	diff1 \|	diff2 \|	blob \| history
kernel/gcov/Kconfig	diff1 \|	diff2 \|	blob \| history
mm/Kconfig	diff1 \|	diff2 \|	blob \| history
security/capability.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/Kconfig	diff1 \|	diff2 \|	blob \| history

x86 "subsystem" repository