linuxpps: Rodolfo Giometti <> wrote: > Merge with linux-vanilla at v2.6.27-rc1. > > Conflicts: > > arch/x86/kernel/irq_32.c > include/linux/tty.h > include/linux/tty_ldisc.h (cut) These are the locations where changes were needed? (when compared to the 2.6.26 version?) Udo