[XFS] Fix merge failures
[pandora-kernel.git] / include / linux / posix-timers.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-20 Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
2008-12-19 Takashi IwaiMerge branch 'fix/hda' into topic/hda
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 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-11-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-10-31 Takashi IwaiMerge commit 'v2.6.28-rc2' into topic/asoc
2008-10-30 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-10-30 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/asoc...
2008-10-29 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
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 Takashi IwaiMerge branches 'topic/fix/asoc', 'topic/fix/hda', ...
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-23 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
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 git://git./linux/kernel/git/sfrench/cifs-2.6
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'drm-next' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-10-23 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/czankel/xtensa-2.6
2008-10-23 Linus TorvaldsMerge branch 'for-upstream' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2008-10-23 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-10-23 Haavard SkinnemoenMerge branches 'boards' and 'fixes' of git://git./linux...
2008-10-23 Len BrownMerge branch 'bugzilla-11715' into test
2008-10-23 Len BrownMerge branch 'linus' into test
2008-10-22 Russell KingMerge branch 'for-rmk' of git://git.android.com/kernel...
2008-10-22 Thomas GleixnerMerge branch 'timers/range-hrtimers' into v28-range...
2008-10-22 Ingo MolnarMerge branch 'tracing/ftrace' into tracing/urgent
2008-10-21 David WoodhouseMerge branch 'master' of /linux/kernel/git/torvalds...
2008-10-21 Benjamin HerrenschmidtMerge commit 'origin' into master
2008-10-20 Linus TorvaldsMerge git://git./linux/kernel/git/kyle/parisc-2.6
2008-10-20 Linus TorvaldsMerge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
2008-10-20 Linus TorvaldsMerge branch 'linux-next' of git://git./linux/kernel...
2008-10-20 Linus TorvaldsMerge branch 'tracing-v28-for-linus' of git://git....
2008-10-20 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-10-20 Linus TorvaldsMerge branch 'genirq-v28-for-linus' of git://git./linux...
2008-10-20 Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-10-20 Linus TorvaldsMerge branch 'v28-timers-for-linus' of git://git./linux...
2008-10-20 Thomas GleixnerMerge branches 'timers/clocksource', 'timers/hrtimers...
2008-09-24 Oleg Nesterovposix-timers: kill ->it_sigev_signo and ->it_sigev_value
2008-09-14 Frank Mayhartimers: fix itimer/many thread hang
2006-12-12 Dave JonesMerge ../linus
2006-10-22 David WoodhouseMerge git://git.infradead.org/~dwmw2/cafe-2.6
2006-10-21 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-10-13 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2006-10-08 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2006-10-05 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2006-10-04 Paul MackerrasMerge branch 'upstream' of git://git./linux/kernel...
2006-10-04 Paul MackerrasMerge branch 'master' of git://oak/home/sfr/kernels...
2006-10-03 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2006-10-03 Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc
2006-10-02 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-10-02 Steven WhitehouseMerge branch 'master' into gfs2
2006-10-01 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-10-01 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-10-01 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-10-01 Jeff GarzikMerge branch 'master' into upstream
2006-10-01 Jeff GarzikMerge branch 'master' into upstream
2006-09-30 Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2006-09-30 Linus TorvaldsMerge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
2006-09-30 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2006-09-30 Linus TorvaldsMerge branch 'intelfb-patches' of /linux/kernel/git...
2006-09-29 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-09-29 Linus TorvaldsMerge git://oss.sgi.com:8090/xfs/xfs-2.6
2006-09-29 Toyo Abe[PATCH] posix-timers: Fix clock_nanosleep() doesn't...
2006-03-21 Linus TorvaldsMerge branch 'origin'
2006-03-21 Tony LuckPull sn2-mmio-writes into release branch
2006-03-21 Tony LuckPull altix-ce1.0-asic into release branch
2006-03-21 Tony LuckPull sn-handle-sc-powerdown into release branch
2006-03-21 Tony LuckPull delete-sigdelayed into release branch
2006-03-21 Tony LuckPull sem2mutex-ioc4 into release branch
2006-03-21 Tony LuckPull ia64-mutex-primitives into release branch
2006-03-21 Tony LuckPull bsp-removal into release branch
2006-03-14 Dave KleikampMerge with /home/shaggy/git/linus-clean/
2006-03-02 Jeff GarzikMerge branch 'lro'
2006-02-24 Anton AltaparmakovMerge ../ntfs-2.6-devel
next