[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[linux-2.6] / arch / mips / sibyte / sb1250 / time.c
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 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
2006-12-13  Russell King[ARM] Merge AT91 and devel branches
2006-12-12  Dave JonesMerge ../linus
2006-12-12  Dave JonesMerge ../linus
2006-12-08  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-12-07  Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2006-12-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
2006-12-06  Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2006-12-05  David HowellsMerge branch 'master' of git://git./linux/kernel/git...
2006-12-05  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2006-12-04  Paul MackerrasMerge branch 'linux-2.6' into for-linus
2006-12-02  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/drzeus/mmc
2006-12-02  Linus TorvaldsMerge branch 'release' of /linux/kernel/git/lenb/linux...
2006-12-02  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-12-02  Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2006-12-02  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-12-02  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2006-12-01  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-11-30  Wim Van SebroeckMerge ../linux-2.6-watchdog-mm
2006-11-30  Atsushi Nemoto[MIPS] mips HPT cleanup: make clocksource_mips public
2006-11-22  James BottomleyMerge ../scsi-rc-fixes-2.6
2006-11-21  Andi KleenMerge branch 'master' of git://git./linux/kernel/git...
2006-11-05  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-11-04  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-11-03  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2006-11-02  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-11-02  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-11-01  Linus TorvaldsMerge branch 'release' of /linux/kernel/git/aegl/linux-2.6
2006-10-31  Atsushi Nemoto[MIPS] Fixup migration to GENERIC_TIME
2006-10-23  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
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-21  Jeff GarzikMerge tag 'jg-20061012-00' of git://electric-eye.fr...
2006-10-21  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-10-13  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2006-10-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2006-10-11  Jeff GarzikMerge branch 'master' into upstream-fixes
2006-10-11  Jeff GarzikMerge branch 'master' into upstream-fixes
2006-10-09  Linus TorvaldsMerge branch 'irqclean-submit1' of /linux/kernel/git...
2006-10-08  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2006-10-08  Ralf Baechle[MIPS] Cleanup unnecessary <asm/ptrace.h> inclusions.
2006-10-08  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2006-10-08  Linus TorvaldsMerge branch 'irq-fixes' of git://git.parisc-linux...
2006-10-08  Ralf Baechle[MIPS] Complete fixes after removal of pt_regs argument...
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-06-16  Len BrownPull bugzilla-5737 into release branch
2006-06-15  Len BrownPull bugzilla-5653 into release branch
2006-04-02  Dmitry TorokhovManual merge with Linus.
2006-03-30  Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2006-03-25  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-03-25  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-03-25  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2006-03-24  Jeff GarzikMerge branch 'upstream'
2006-03-23  Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2006-03-23  Anton AltaparmakovMerge branch 'master' of /home/aia21/ntfs-2.6/
2006-03-23  Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc
2006-03-22  Nathan ScottMerge HEAD from ../linux-2.6
2006-03-21  Jeff GarzikMerge branch 'e1000-fixes' of git://198.78.49.142/...
2006-03-21  James BottomleyMerge ../linux-2.6
2006-03-21  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-03-21  Linus TorvaldsMerge branch 'origin'
2006-03-21  Tony LuckPull sn2-reduce-kmalloc-wrap into release branch
2006-03-21  Tony LuckPull mca-cleanup into release branch
2006-03-21  Tony LuckPull icc-cleanup into release branch
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
next