[XFS] Fix merge failures
[pandora-kernel.git] / include / linux / tty_ldisc.h
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot...
2008-10-17 Linus TorvaldsMerge branch 'for-linus' of git://www.jni.nu/cris
2008-10-12 Ingo MolnarMerge branches 'x86/xen', 'x86/build', 'x86/microcode...
2008-10-03 Ingo MolnarMerge commit 'v2.6.27-rc8' into x86/setup
2008-10-02 Ingo MolnarMerge commit 'v2.6.27-rc8' into genirq
2008-09-05 Ingo MolnarMerge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
2008-08-18 Jesse BarnesMerge branch 'pci-for-jesse' of git://git./linux/kernel...
2008-08-11 Linus TorvaldsMerge branch 'timers-fixes-for-linus' of git://git...
2008-08-11 Ingo MolnarMerge branch 'linus' into core/rcu
2008-08-08 Ben DooksMerge ftp.arm.linux.org.uk/pub/linux/arm/kernel/git...
2008-08-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-08-06 Wim Van Sebroeck[WATCHDOG] Merge code clean-up's from Alan Cox.
2008-08-01 Linus TorvaldsMerge branch 'for-linus' of git://neil.brown.name/md
2008-08-01 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2008-07-31 Ingo MolnarMerge branch 'linus' into timers/hpet
2008-07-30 Ingo MolnarMerge branch 'x86/core' into x86/xsave
2008-07-29 Anton VorontsovMerge branch 'master' of /home/cbou/linux-2.6
2008-07-28 Ingo MolnarMerge branch 'linus' into core/generic-dma-coherent
2008-07-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-28 Ingo MolnarMerge branch 'x86/crashdump' into x86/urgent
2008-07-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-27 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-07-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-27 Haavard SkinnemoenMerge commit 'upstream/master'
2008-07-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-25 Linus TorvaldsMerge git://git.infradead.org/embedded-2.6
2008-07-25 David WoodhouseMerge branch 'linux-next' of git://git.infradead.org...
2008-07-25 Ingo MolnarMerge branch 'linus' into x86/pebs
2008-07-24 Linus TorvaldsMerge branch 'timers-fixes-for-linus' of git://git...
2008-07-24 Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-07-24 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-07-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-07-24 Ingo MolnarMerge branch 'linus' into tracing/urgent
2008-07-24 Linus TorvaldsMerge branch 'sched/for-linus' of git://git./linux...
2008-07-24 Linus TorvaldsMerge branch 'core/softlockup-for-linus' of git://git...
2008-07-24 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2008-07-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-23 Jiri KosinaMerge branch 'master' of git://git./linux/kernel/git...
2008-07-23 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-07-22 Jeff GarzikMerge branch 'r8169-davem' of git://git./linux/kernel...
2008-07-22 Benjamin HerrenschmidtMerge commit 'origin/master'
2008-07-22 Ingo MolnarMerge branch 'linus' into x86/x2apic
2008-07-21 Andi KleenMerge branch 'for-upstream/acpi-test' of git://repo...
2008-07-21 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-07-21 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-07-21 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-21 Linus TorvaldsMerge git://git./linux/kernel/git/agk/linux-2.6-dm
2008-07-21 Linus TorvaldsMerge branch 'for-linus' of git://neil.brown.name/md
2008-07-21 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-07-21 Ingo MolnarMerge branch 'linus' into cpus4096-for-linus
2008-07-21 Ingo MolnarMerge branches 'x86/urgent', 'x86/amd-iommu', 'x86...
2008-07-21 Ingo MolnarMerge branch 'linus' into xen-64bit
2008-07-21 Ingo MolnarMerge branch 'linus' into x86/paravirt-spinlocks
2008-07-21 Ingo MolnarMerge branch 'linus' into x86/urgent
2008-07-21 Dmitry TorokhovMerge /linux/kernel/git/torvalds/linux-2.6 into next
2008-07-21 Linus TorvaldsMerge branch 'for-2.6.27' of git://linux-nfs.org/~bfiel...
2008-07-21 Linus TorvaldsMerge branch 'drm-fixes' of git://git./linux/kernel...
2008-07-21 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-07-21 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux-mfd
2008-07-21 Linus TorvaldsMerge git://git./linux/kernel/git/mchehab/v4l-dvb
2008-07-21 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2008-07-21 Linus TorvaldsMerge branch 'kvm-updates-2.6.27' of git://git./linux...
2008-07-21 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-07-21 Linus TorvaldsMerge branch 'for-linus' of git://www.jni.nu/cris
2008-07-21 Linus TorvaldsMerge branch 'configfs-fixup-ptr-error' of git://oss...
2008-07-21 Alan Coxtty: Ldisc revamp
2007-07-22 Len BrownPull video into release branch
2007-07-22 Len BrownPull dock-bay into release branch
2007-07-22 Len BrownPull battery into release branch
2007-07-05 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-06-13 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-06-05 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2007-06-04 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-15 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2007-05-13 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2007-05-11 Linus TorvaldsMerge branch 'linus' of /linux/kernel/git/perex/alsa
2007-05-11 Linus TorvaldsMerge branch 'master' of ssh:///linux/kernel/git/mcheha...
2007-05-11 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-05-11 Wim Van SebroeckMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-05-11 Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2007-05-11 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-05-11 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-05-11 Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.dk/data...
2007-05-11 Linus TorvaldsMerge branch 'audit.b38' of git://git./linux/kernel...
2007-05-11 Linus TorvaldsMerge branch 'upstream-fixes' of /linux/kernel/git...
2007-05-11 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2007-05-11 Paul Fulghumtty: add compat_ioctl
2007-02-17 Kyle McMartinMerge branch 'parisc' from /home/kyle/repos/parisc...
2007-02-10 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-02-03 Len BrownPull video into test branch
2007-01-17 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-12-20 Len BrownPull bugfix into test branch
2006-12-20 Len BrownPull ec into test branch
2006-12-20 Len BrownPull platform-drivers into test branch
2006-12-16 Len BrownPull style into test branch
2006-12-16 Len BrownPull bugfix into test branch
2006-12-16 Len BrownPull trivial into test branch
2006-12-16 Len BrownPull platform-drivers into test branch
2006-12-16 Len BrownPull button into test branch
next