Jeremy Fitzhardinge 38f4b8c0da Merge commit 'origin/master' into for-linus/xen/master ... * commit 'origin/master': (4825 commits) Fix build errors due to CONFIG_BRANCH_TRACER=y parport: Use the PCI IRQ if offered tty: jsm cleanups Adjust path to gpio headers KGDB_SERIAL_CONSOLE check for module Change KCONFIG name tty: Blackin CTS/RTS Change hardware flow control from poll to interrupt driven Add support for the MAX3100 SPI UART. lanana: assign a device name and numbering for MAX3100 serqt: initial clean up pass for tty side tty: Use the generic RS485 ioctl on CRIS tty: Correct inline types for tty_driver_kref_get() splice: fix deadlock in splicing to file nilfs2: support nanosecond timestamp nilfs2: introduce secondary super block nilfs2: simplify handling of active state of segments nilfs2: mark minor flag for checkpoint created by internal operation nilfs2: clean up sketch file nilfs2: super block operations fix endian bug ... Conflicts: arch/x86/include/asm/thread_info.h arch/x86/lguest/boot.c drivers/xen/manage.c		2009-04-07 13:34:16 -07:00
..
boot.c	Merge commit 'origin/master' into for-linus/xen/master	2009-04-07 13:34:16 -07:00
i386_head.S	lguest: use KVM hypercalls	2009-03-30 21:55:24 +10:30
Kconfig	x86: remove the Voyager 32-bit subarch	2009-02-23 00:54:01 +01:00
Makefile	Move lguest guest support to arch/x86.	2007-10-23 15:49:50 +10:00