Thomas Gleixner a18f22a968 Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource ... Conflicts: arch/ia64/kernel/cyclone.c arch/mips/kernel/i8253.c arch/x86/kernel/i8253.c Reason: Resolve conflicts so further cleanups do not conflict further Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2011-05-14 12:06:36 +02:00
..
boot.c	Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource	2011-05-14 12:06:36 +02:00
i386_head.S	x86, mm: Initialize initial_page_table before paravirt jumps	2011-01-04 09:53:50 +01:00
Kconfig	LGUEST_GUEST: fix unmet direct dependencies (VIRTUALIZATION && VIRTIO)	2011-01-20 21:37:30 +10:30
Makefile	lguest: fix 'unhandled trap 13' with CONFIG_CC_STACKPROTECTOR	2009-06-04 11:50:06 -07:00