[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[linux-2.6] / include / asm-x86_64 / swiotlb.h
2007-02-11  Dave Jones[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
2007-02-09  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-08  David S. MillerMerge branch 'HEAD' of /linux/kernel/git/herbert/crypto-2.6
2007-02-08  Linus TorvaldsMerge /pub/scm/linux/kernel/git/paulus/powerpc
2007-02-08  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-02-07  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-02-07  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-07  Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2007-02-07  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-02-06  Jan Beulich[IA64] swiotlb abstraction (e.g. for Xen)
2007-02-06  Jan Beulich[IA64] swiotlb bug fixes
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-09-23  Jeff GarzikMerge tag 'r8169-20060920-00' of git://electric-eye...
2006-09-19  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-09-17  Stefan Richterieee1394: merge from Linus
2006-09-13  Jeff GarzikMerge tag 'r8169-20060912-00' of git://electric-eye...
2006-09-05  Dave JonesMerge ../linus
2006-08-30  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-08-28  James BottomleyMerge ../linux-2.6
2006-08-21  Len BrownMerge trivial low-risk suspend hotkey bugzilla-5918...
2006-08-10  Jeff GarzikMerge branch 'sii-m15w' into upstream
2006-08-06  James BottomleyMerge ../linux-2.6
2006-08-05  Dmitry TorokhovMerge /linux/kernel/git/torvalds/linux-2.6 into for...
2006-08-04  Greg Kroah-HartmanMerge branch 'for-linus' of git://git./linux/kernel...
2006-08-03  Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-08-03  Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-08-02  John W. LinvilleMerge branch 'from-linus' into upstream
2006-08-02  John W. LinvilleMerge branch 'from-linus' into bcm43xx
2006-08-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
2006-08-01  Paul MackerrasMerge branch 'merge'
2006-07-31  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2006-07-31  Steven WhitehouseMerge branch 'master'
2006-07-30  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-07-30  Andi Kleen[PATCH] x86_64: Fix swiotlb=force
2006-07-15  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-07-05  Jeff GarzikMerge branch 'upstream' of git://lost.foo-projects...
2006-07-04  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-serial
2006-07-03  Steven WhitehouseMerge git./linux/kernel/git/torvalds/linux-2.6
2006-06-29  Dave JonesMerge ../linus
2006-06-28  Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2006-06-26  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2006-06-26  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-06-25  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-06-24  Russell KingMerge signal handler branch
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-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 git://oss.sgi.com:8090/xfs-2.6
2006-06-21  Tony LuckPull rework-memory-attribute-aliasing into release...
2006-06-21  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2006-06-21  Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2006-06-21  Linus TorvaldsMerge git://git./linux/kernel/git/bcollins/linux1394-2.6
2006-06-21  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2006-06-21  Trond MyklebustMerge branch 'master' of /home/trondmy/kernel/linux...
2006-06-21  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-06-21  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2006-06-20  Linus TorvaldsMerge branch 'rio.b19' of git://git./linux/kernel/git...
2006-06-20  Linus TorvaldsMerge branch 'audit.b21' of git://git./linux/kernel...
2006-06-20  Linus TorvaldsMerge git://git.infradead.org/hdrcleanup-2.6
2006-05-24  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-05-06  David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2.6
2006-05-01  David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2.6
2006-04-30  David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2.6
2006-04-29  David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2.6
2006-04-26  David WoodhouseDon't include linux/config.h from anywhere else in...
2006-03-21  Tony LuckPull bsp-removal into release branch
2006-02-01  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/x86
2006-01-27  Len BrownPull release into acpica branch
2006-01-24  Len Brown[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica...
2006-01-24  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2006-01-19  Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2006-01-17  Jeff GarzikMerge branch 'upstream'
2006-01-17  Jeff GarzikMerge branch 'upstream'
2006-01-14  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2006-01-13  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-01-12  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-01-12  Linus TorvaldsMerge branch 'drm-forlinus' of git://git./linux/kernel...
2006-01-12  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-01-12  Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2006-01-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
2006-01-12  Muli Ben-Yehuda[PATCH] x86_64: Use function pointers to call DMA mappi...
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-11  Jeff GarzikMerge branch 'atmel'
2005-11-10  Tony LuckPull context-bitmap into release branch
2005-11-09  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-09  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-11-06  Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  Jeff GarzikMerge branch 'master'
next