[XFS] Fix merge failures
[pandora-kernel.git] / include / linux / poll.h
2008-12-25 Takashi IwaiMerge branch 'topic/snd-hrtimer' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/jack-mechanical' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/aoa' into to-push
2008-12-23 Ingo MolnarMerge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
2008-12-20 Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
2008-12-19 Takashi IwaiMerge branch 'fix/hda' into topic/hda
2008-12-12 Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/mm
2008-12-09 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-12-03 Ingo MolnarMerge commit 'v2.6.28-rc7'; branch 'x86/dumpstack'...
2008-11-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-26 Takashi IwaiMerge branch 'topic/misc' into topic/pcsp-fix
2008-11-25 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-24 Paul MackerrasMerge branch 'merge' of git://git./linux/kernel/git...
2008-11-21 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/sound...
2008-11-18 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-11-12 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-10 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-06 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-11-06 Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
2008-11-05 James MorrisMerge branch 'master' into next
2008-11-03 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-02 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-10-31 Takashi IwaiMerge commit 'v2.6.28-rc2' into topic/asoc
2008-10-31 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-10-30 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-10-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-29 Jesper NilssonMerge branch 'for-next' of git://jni.nu/cris into cris_...
2008-10-28 Linus TorvaldsMerge branch 'irq-fixes-for-linus' of git://git./linux...
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/doc
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot...
2008-10-28 Paul MundtMerge branches 'sh/serial-rework' and 'sh/oprofile'
2008-10-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-27 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/uv
2008-10-27 Ingo MolnarMerge commit 'v2.6.28-rc2' into tracing/urgent
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://neil.brown.name/md
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-26 Linus TorvaldsMerge branch 'for-upstream' of git://git./linux/kernel...
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-25 Len BrownMerge branch 'i7300_idle' into release
2008-10-24 Ingo MolnarMerge commit 'v2.6.28-rc1' into sched/urgent
2008-10-24 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-10-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-10-23 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-10-23 Linus TorvaldsMerge branch 'proc' of git://git./linux/kernel/git...
2008-10-23 Linus TorvaldsMerge branch 'v28-range-hrtimers-for-linus-v2' of git...
2008-10-22 Thomas GleixnerMerge branch 'timers/range-hrtimers' into v28-range...
2008-10-17 Arjan van de VenMerge commit 'linus/master' into merge-linus
2008-09-06 Arjan van de Venselect: switch select() and poll() over to hrtimers
2008-09-06 Thomas Gleixnerselect: add poll_select_set_timeout() and poll_select_c...
2008-07-11 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-07-10 Russell KingMerge branches 'at91', 'dyntick', 'ep93xx', 'iop',...
2008-07-03 Russell KingMerge branch 'fb' into devel
2008-05-19 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-05-14 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-05-09 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-05-09 Paul MackerrasMerge branch 'for-2.6.26' of /linux/kernel/git/jwboyer...
2008-05-09 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-05-08 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-05-07 Russell KingMerge branch 'irq-fix' of git://modarm9.com/gitsrc...
2008-05-06 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-05-06 Jiri KosinaMerge branch 'master' of git://git./linux/kernel/git...
2008-05-06 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-05-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-05 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-03 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2008-05-03 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-03 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-05-03 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-05-03 Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc
2008-05-02 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-05-02 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-05-02 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-01 Al Viro[PATCH] make osf_select() use core_sys_select()
2007-10-19 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-10-15 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-10-13 David WoodhouseMerge Linux 2.6.23
2007-10-13 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-10-10 Len BrownPull bugzilla-8709 into release branch
2007-10-10 Len BrownPull thermal into release branch
2007-10-10 Len BrownPull video into release branch
2007-10-10 Len BrownPull fujitsu-v3 into release branch
2007-10-10 Len BrownPull sony-2.6.24 into release branch
2007-09-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-09-24 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-09-17 Len BrownPull thinkpad into release branch
2007-09-17 Len BrownPull misc into release branch
2007-09-15 Jeff GarzikMerge branch 'fixes-jgarzik' of git://git./linux/kernel...
2007-09-15 Linus TorvaldsMerge git://git.linux-xtensa.org/kernel/xtensa-feed
2007-09-14 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/cooloney...
2007-09-13 Paul MackerrasMerge branch 'linux-2.6' into for-2.6.24
2007-09-12 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2007-09-12 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2007-09-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
next