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

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 1684e41 0e90ed0)

commit	38b3d7fbd3a2f41ea73fea6d8bbe3fb3b3ba0f6d
author	Ingo Molnar <mingo@elte.hu>
	Thu, 30 Jun 2011 20:15:17 +0000 (30 22:15 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 30 Jun 2011 20:15:17 +0000 (30 22:15 +0200)
tree	1b6513c7c61ab6b6cee59022d9a53c1459eae5dc	tree \| snapshot (tar.gz zip)
parent	1684e41f5fa7b0448fd8154ca7c02f23c8df96f8	commit \| diff
parent	0e90ed0e8b9b1c25040442f1d20c799751b1e727	commit \| diff

Merge branch 'linus' into out-of-tree

Conflicts:
drivers/net/Kconfig
kernel/gcov/Kconfig

14 files changed:

drivers/block/floppy.c	diff1 \|	diff2 \|	blob \| history
drivers/leds/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/power/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/watchdog/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/cifs/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/cifs/cifs_debug.c	diff1 \|	diff2 \|	blob \| history
kernel/gcov/Kconfig	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history

x86 "subsystem" repository