[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[linux-2.6] / include / asm-x86_64 / swiotlb.h
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  James BottomleyMerge by Hand
2005-11-05  Jeff GarzikMerge branch 'master'
2005-11-05  Linus TorvaldsMerge branch 'srp' of /linux/kernel/git/roland/infiniband
2005-11-05  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-05  Linus TorvaldsMerge /linux/kernel/git/paulus/powerpc-merge
2005-11-04  Linus TorvaldsMerge /pub/scm/linux/kernel/git/acme/net-2.6
2005-11-04  Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2005-11-03  Tony LuckAuto-update from upstream
2005-11-03  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-03  Linus TorvaldsMerge branch 'swiotlb' of git://git./linux/kernel/git...
2005-11-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/airlied/drm-2.6
2005-10-31  Tony Luckmanual update from upstream:
2005-10-31  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-10-31  Paul MackerrasMerge ../linux-2.6 by hand
2005-10-30  Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2005-10-29  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2005-10-29  Arnaldo Carvalho... Merge /pub/scm/linux/kernel/git/sridhar/lksctp-2.6
2005-10-28  Roland DreierMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-10-28  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2005-10-28  Arnaldo Carvalho... Merge /linux/kernel/git/holtmann/bluetooth-2.6
2005-10-28  Greg KHMerge ../bleed-2.6
2005-10-28  James BottomleyMerge HEAD from ../scsi-misc-2.6-old
2005-10-28  Jeff GarzikMerge branch 'master'
2005-10-28  Jeff GarzikMerge branch 'master'
2005-10-28  Jeff GarzikMerge branch 'master'
2005-10-28  Jeff GarzikMerge branch 'master'
2005-10-28  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-10-28  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-10-28  Kyle McMartinAuto-update from upstream
2005-10-28  Jeff GarzikMerge branch 'master'
2005-10-28  Linus TorvaldsMerge branch 'sx8' of /linux/kernel/git/jgarzik/misc-2.6
2005-10-28  Linus TorvaldsMerge branch 'upstream' of /linux/kernel/git/jgarzik...
2005-10-28  Linus TorvaldsMerge branch 'upstream' of /linux/kernel/git/jgarzik...
2005-10-28  Linus TorvaldsMerge branch 'elevator-switch' of git://brick.kernel...
2005-10-28  Linus TorvaldsMerge branch 'generic-dispatch' of git://brick.kernel...
2005-10-28  Linus TorvaldsMerge branch 'for-linus' of git://brick.kernel.dk/data...
2005-10-28  Linus TorvaldsMerge /pub/scm/linux/kernel/git/acme/net-2.6.15
2005-10-28  Al Viro[PATCH] gfp_t: dma-mapping (ia64)
2005-10-20  Tony LuckUpdate from upstream with manual merge of Yasunori...
2005-09-29  John W. Linville[PATCH] swiotlb: support syncing sub-ranges of mappings
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2