[XFS] Fix merge failures
[pandora-kernel.git] / arch / powerpc / kernel / vdso32 / gettimeofday.S
2008-12-29 Lachlan McIlroy[XFS] Fix merge failures
2008-12-29 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-12-18 Paul MackerrasMerge branch 'linux-2.6' into next
2008-12-16 Paul MackerrasMerge branch 'merge' into next
2008-12-03 Paul MackerrasMerge branch 'merge'
2008-11-19 Paul MackerrasMerge branch 'linux-2.6' into next
2008-11-11 Paul MackerrasMerge branch 'linux-2.6' into next
2008-11-05 Paul Mackerraspowerpc: Improve resolution of VDSO clock_gettime
2007-07-22 Len BrownPull osi into release branch
2007-07-22 Len BrownPull video into release branch
2007-07-22 Len BrownPull throttle into release branch
2007-07-22 Len BrownPull misc into release branch
2007-07-22 Len BrownPull dock-bay into release branch
2007-07-22 Len BrownPull bugzilla-7880 into release branch
2007-07-22 Len BrownPull ec into release branch
2007-07-22 Len BrownPull sbs into release branch
2007-07-22 Len BrownPull battery into release branch
2007-07-22 Len BrownPull acpi-debug into release branch
2007-07-19 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2007-07-17 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-07-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2007-07-15 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-07-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-07-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-07-11 Paul MackerrasMerge branch 'for-2.6.23' into merge
2007-07-09 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-05 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-02 Jeff GarzikMerge branch 'libertas-fixes' of git://git./linux/kerne...
2007-06-30 Linus TorvaldsMerge branch 'master' of /linux/kernel/git/davem/sparc-2.6
2007-06-29 David S. MillerMerge /pub/scm/linux/kernel/git/vxy/lksctp-dev
2007-06-27 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-06-26 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2007-06-26 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-06-26 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2007-06-26 Tony Breeds[POWERPC] Fix VDSO gettimeofday() when called with...
2006-09-30 Linus TorvaldsMerge branch 'intelfb-patches' of /linux/kernel/git...
2006-09-26 Tony LuckPull esi-support into release branch
2006-09-26 Tony LuckPull model-name into release branch
2006-07-15 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-07-13 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2006-07-05 Jeff GarzikMerge branch 'upstream' of git://lost.foo-projects...
2006-07-04 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-07-04 Linus TorvaldsMerge git://git.infradead.org/hdrinstall-2.6
2006-07-04 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-serial
2006-07-04 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2006-07-03 Sam RavnborgMerge branch 'master' of /home/sam/kernel/linux-2.6/
2006-07-03 Kumar GalaMerge branch '83xx' into for_paulus
2006-07-03 Trond MyklebustMerge branch 'master' of /home/trondmy/kernel/linux...
2006-07-03 James BottomleyMerge ../scsi-misc-2.6
2006-07-03 Steven WhitehouseMerge git./linux/kernel/git/torvalds/linux-2.6
2006-07-02 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2006-07-01 Len BrownPull acpi_device_handle_cleanup into release branch
2006-07-01 Len BrownPull acpi_os_free into release branch
2006-07-01 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2006-07-01 Len BrownPull acpi_device_handle_cleanup into release branch
2006-07-01 Len BrownPull kmalloc into release branch
2006-06-30 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2006-06-30 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-06-30 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-06-30 Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2006-06-30 Jörn EngelRemove obsolete #include <linux/config.h>
2006-01-24 Dave KleikampMerge with /home/shaggy/git/linus-clean/
2006-01-03 Dave Airliedrm: merge in Linus mainline
2005-12-06 Len BrownPull release into acpica branch
2005-11-21 David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-11-20 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-19 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-18 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-18 Jeff GarzikMerge branch 'linville-e1000' of git://git.tuxdriver...
2005-11-18 Jeff GarzikMerge branch 'upstream-fixes' of git://git.tuxdriver...
2005-11-18 Jeff GarzikMerge branch 'halasa-hdlc' of git://git.tuxdriver.com...
2005-11-18 Jeff GarzikMerge branch 'upstream-jgarzik' of git://git.tuxdriver...
2005-11-18 Jeff GarzikMerge branch 'master'
2005-11-18 Jeff GarzikMerge branch 'upstream'
2005-11-18 Jeff GarzikMerge branch 'upstream'
2005-11-18 Jody McIntyreMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-17 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-17 Jeff GarzikMerge branch 'upstream-fixes'
2005-11-17 Jeff GarzikMerge branch 'upstream-fixes'
2005-11-17 Jeff GarzikMerge branch 'master'
2005-11-16 Jeff GarzikMerge branch 'upstream-fixes'
2005-11-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-11-16 Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc-merge
2005-11-16 Benjamin Herrenschmidt[PATCH] powerpc: Make the vDSO functions set error...
2005-11-16 Jeff GarzikMerge branch 'master'
2005-11-16 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-15 Linus TorvaldsMerge branch 'upstream-fixes' of /linux/kernel/git...
2005-11-15 Jeff GarzikMerge branch 'master'
2005-11-15 Linus TorvaldsMerge x86-64 update from Andi
2005-11-15 Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc-merge
2005-11-14 Paul MackerrasMerge git://oak/home/sfr/kernels/iseries/work
2005-11-14 Benjamin Herrenschmidt[PATCH] powerpc: vdso fixes (take #2)
2005-11-13 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-12 Jeff GarzikMerge branch 'master'
2005-11-12 Jeff GarzikMerge branch 'master'
2005-11-12 Jeff GarzikMerge branch 'sky2'
2005-11-12 Jeff GarzikMerge branch 'sis900-wol'
2005-11-12 Jeff GarzikMerge branch '8139-thread'
2005-11-12 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2005-11-12 Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
next