[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[linux-2.6] / drivers / net / wireless / hostap / Kconfig
2006-03-21  Linus TorvaldsMerge branch 'origin'
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
2006-03-21  Tony LuckPull delete-sigdelayed into release branch
2006-03-21  Tony LuckPull sem2mutex-ioc4 into release branch
2006-03-21  Tony LuckPull ia64-mutex-primitives into release branch
2006-03-21  Tony LuckPull bsp-removal into release branch
2006-03-14  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2006-03-02  Jeff GarzikMerge branch 'lro'
2006-02-24  Anton AltaparmakovMerge ../ntfs-2.6-devel
2006-02-24  Anton AltaparmakovMerge branch 'master' of /home/src/linux-2.6/
2006-02-23  Steven WhitehouseMerge branch 'master'
2006-02-21  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-02-14  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-02-09  Jeff GarzikMerge branch 'net.b0' of git://git./linux/kernel/git...
2006-02-09  Jeff GarzikMerge branch 'upstream-fixes'
2006-02-09  Jeff GarzikMerge branch 'upstream'
2006-02-07  Paul MackerrasMerge git://git./linux/kernel/git/paulus/powerpc
2006-02-07  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-bugfix
2006-02-07  Mauro Carvalho ChehabMerge branch 'work-fixes'
2006-02-07  Jeff GarzikMerge branch 'for-jeff' of git://electric-eye.fr.zoreil...
2006-02-07  Jeff GarzikMerge branch 'sundance'
2006-02-06  Paul MackerrasMerge ../linux-2.6
2006-02-06  Tony LuckPull sn-recursive-flags-for-select-builds into release...
2006-02-04  Linus TorvaldsMerge /pub/scm/linux/kernel/git/kyle/parisc-2.6
2006-02-03  Adrian BunkMerge ... git://git./linux/kernel/git/torvalds/linux...
2006-02-02  Tony LuckPull sgi-drivers-makefile-cleanup into release branch
2006-02-02  Tony LuckPull update-tlbflush-sn into release branch
2006-02-02  Linus TorvaldsMerge branch 'drm-linus' of git://git./linux/kernel...
2006-02-02  Jeff GarzikMerge branch 'master'
2006-02-02  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-02-01  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-02-01  Jaroslav KyselaMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-02-01  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-02-01  Linus TorvaldsMerge branch 'upstream-fixes' of /linux/kernel/git...
2006-02-01  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2006-02-01  Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2006-02-01  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/bnx2-2.6
2006-02-01  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/x86
2006-02-01  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-01-31  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-01-31  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-01-31  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-01-31  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2006-01-31  Mauro Carvalho ChehabMerge branch 'origin'
2006-01-31  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-01-31  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-01-31  Linus TorvaldsMerge branch 'for-linus' of git://brick.kernel.dk/data...
2006-01-31  Linus TorvaldsMerge branch 'upstream-fixes' of /linux/kernel/git...
2006-01-31  Jeff GarzikMerge branch 'upstream-fixes'
2006-01-31  Jeff GarzikMerge branch 'upstream-fixes' of git://git./linux/kerne...
2006-01-30  John W. LinvilleMerge branch 'upstream-fixes'
2006-01-30  Adrian Bunk[PATCH] PCMCIA=m, HOSTAP_CS=y is not a legal configuration
2006-01-27  Len BrownPull release into acpica branch
2006-01-27  Jeff GarzikMerge branch 'master'
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-20  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-01-20  David S. MillerMerge /pub/scm/linux/kernel/git/sridhar/lksctp-2.6
2006-01-19  Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2006-01-19  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sfrench/cifs-2.6
2006-01-18  Russell KingMerge /linux/kernel/git/tmlind/linux-omap-upstream
2006-01-18  David S. MillerMerge git://tipc.cslab.ericsson.net/pub/git/tipc
2006-01-18  David TeiglandMerge branch 'master'
2006-01-18  Jeff GarzikMerge branch 'master'
2006-01-18  Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2006-01-18  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-01-18  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-01-18  Jeff GarzikMerge branch 'janitor'
2006-01-17  Jeff GarzikMerge branch 'upstream-jgarzik' of git://git.tuxdriver...
2006-01-16  Pavel Roskin[PATCH] hostap: allow flashing firmware
2005-11-06  Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-09-14  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/chrisw/lsm-2.6
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dwmw2/audit-2.6
2005-09-11  Tony LuckPull sn-features into release branch
2005-09-11  Tony LuckPull sim-fixes into release branch
2005-09-11  Linus TorvaldsMerge branch 'for-linus' from /.../shaggy/jfs-2.6 manually
2005-09-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-09-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-09-08  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-i2c manually
2005-09-08  James BottomleyMerge HEAD from ../scsi-iscsi-2.6
2005-09-08  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-08  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-08  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-08  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-09-08  Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2005-09-06  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-09-06  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-09-05  Linus TorvaldsMerge branch 'upstream' of /linux/kernel/git/jgarzik...
2005-09-05  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-09-05  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-09-05  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-09-04  Dmitry TorokhovMerge HEAD from /linux/kernel/git/torvalds/linux-2...
2005-09-03  Len BrownMerge linux-2.6 into linux-acpi-2.6 test
2005-09-02  Linus TorvaldsMerge refs/heads/ieee80211-wifi from /linux/kernel...
2005-09-02  Jeff Garzik[wireless hostap] automatically select ieee80211 depend...
2005-09-02  Linus TorvaldsMerge HEAD from /home/rmk/linux-2.6-serial
2005-09-02  Linus TorvaldsMerge HEAD from kernel.org:/home/rmk/linux-2.6-arm
next