mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 22:51:42 +00:00
38f4b8c0da
* 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 |
||
---|---|---|
.. | ||
debugfs.c | ||
debugfs.h | ||
enlighten.c | ||
grant-table.c | ||
irq.c | ||
Kconfig | ||
Makefile | ||
mmu.c | ||
mmu.h | ||
multicalls.c | ||
multicalls.h | ||
setup.c | ||
smp.c | ||
spinlock.c | ||
suspend.c | ||
time.c | ||
vdso.h | ||
xen-asm_32.S | ||
xen-asm_64.S | ||
xen-asm.h | ||
xen-asm.S | ||
xen-head.S | ||
xen-ops.h |