[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[linux-2.6] / sound / drivers / mpu401 /
2006-12-12  Dave JonesMerge ../linus
2006-11-30  Wim Van SebroeckMerge ../linux-2.6-watchdog-mm
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-11  Jeff GarzikMerge branch 'master' into upstream-fixes
2006-10-08  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2006-10-06  Jeff GarzikMerge branch 'master' into upstream-fixes
2006-10-05  Linus TorvaldsMerge git://git.infradead.org/~dhowells/irq-2.6
2006-10-05  David HowellsIRQ: Maintain regs pointer globally rather than passing...
2006-10-04  Paul MackerrasMerge branch 'master' of git://oak/home/sfr/kernels...
2006-10-02  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-10-01  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-09-30  Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
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-28  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-mmc
2006-09-28  Russell KingMerge nommu branch
2006-09-27  Paul MackerrasMerge branch 'upstream' of git://git./linux/kernel...
2006-09-27  Russell KingMerge /linux/kernel/git/tmlind/linux-omap-upstream...
2006-09-27  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-09-26  Tony LuckPull esi-support into release branch
2006-09-26  Tony LuckPull model-name into release branch
2006-09-25  Steven Whitehouse[GFS2] Fix up merge of Linus' kernel into GFS2
2006-09-24  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-09-24  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-09-24  Jeff GarzikMerge branch 'master' into upstream
2006-09-24  James BottomleyMerge mulgrave-w:git/linux-2.6
2006-09-24  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2006-09-24  Linus TorvaldsMerge branch 'linus' of /linux/kernel/git/perex/alsa
2006-09-23  Takashi Iwai[ALSA] Deprecate snd_card_free_in_thread()
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 'release' of git://git./linux/kernel/git...
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-mmc
2006-07-02  Linus TorvaldsMerge branch 'genirq' of /home/rmk/linux-2.6-arm
2006-07-02  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2006-07-02  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-mmc
2006-07-02  Thomas Gleixner[PATCH] irq-flags: sound: Use the new IRQF_ constants
2006-06-29  Len Brownmerge linus into release branch
2006-06-29  Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/devfs-2.6
2006-06-29  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2006-06-29  Dave JonesMerge ../linus
2006-06-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/perex/alsa
2006-06-29  Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc
2006-06-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/kyle/parisc-2.6
2006-06-29  Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2006-06-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2006-06-28  Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2006-06-27  Greg Kroah-Hartman[PATCH] 64bit resource: fix up printks for resources...
2006-06-26  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2006-06-26  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-06-26  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-06-25  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-06-25  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-06-24  Russell KingMerge signal handler branch
2006-06-24  Trond MyklebustMerge branch 'master' of /home/trondmy/kernel/linux...
2006-06-23  Tony LuckAuto-update from upstream
2006-06-23  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-06-23  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-mmc
2006-06-23  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2006-06-23  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-serial
2006-06-23  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-06-23  Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc
2006-06-23  Jeff GarzikMerge branch 'upstream' of git://electric-eye.fr.zoreil...
2006-06-23  Jeff GarzikMerge branch 'master' into upstream
2006-06-23  Jeff GarzikMerge branch 'master' into upstream
2006-06-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
2006-06-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/w1-2.6
2006-06-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2006-06-22  Takashi Iwai[ALSA] Change an arugment of snd_mpu401_uart_new()...
2006-06-22  Takashi Iwai[ALSA] mpu401_uart - Fix coding style and code clean up
2006-06-22  Rene Herman[ALSA] unregister platform device again if probe was...
2006-06-21  Tony LuckPull rework-memory-attribute-aliasing into release...
2006-06-20  Linus TorvaldsMerge git://git.infradead.org/~dwmw2/rbtree-2.6
2006-06-20  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2006-06-20  Linus TorvaldsMerge branch 'i915fb' of git://git./linux/kernel/git...
2006-06-16  Len BrownPull button into release branch
2006-06-16  Len BrownPull bugzilla-5737 into release branch
2006-06-16  Len BrownPull bugzilla-5000 into release branch
2006-06-16  Len BrownPull bugzilla-5764 into release branch
2006-06-16  Len BrownPull sem2mutex into release branch
2006-06-16  Len BrownPull trivial2 into release branch
2006-06-16  Len BrownPull video into release branch
2006-06-16  Len BrownPull acpi_bus_register_driver into release branch
2006-06-15  Len BrownPull bugzilla-5452 into release branch
2006-06-15  Len BrownPull bugzilla-5653 into release branch
next