[XFS] Fix merge failures
[linux-2.6] / drivers / net / wireless / ath9k /
2008-12-29  Lachlan McIlroy[XFS] Fix merge failures
2008-12-29  Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-next
2008-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-nvram
2008-12-28  James MorrisMerge branch 'next' into for-linus
2008-12-28  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-next-2.6
2008-12-28  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-26  Hannes Ederdrivers/net/wireless/ath9k: fix sparse warnings: make...
2008-12-26  David S. MillerMerge branch 'for-david' of git://git./linux/kernel...
2008-12-25  Takashi IwaiMerge branch 'topic/udev-id-rename' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/snd-hrtimer' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/pcxhr-update' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/oxygen' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/jack-mechanical' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/cs5535audio' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/audigy-capture-boost' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/asoc' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/aoa' into to-push
2008-12-24  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-23  Ingo MolnarMerge branch 'x86/iommu' into x86/core
2008-12-23  Ingo MolnarMerge branch 'x86/ptrace' into x86/tsc
2008-12-23  Ingo MolnarMerge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
2008-12-23  Ingo MolnarMerge commit 'v2.6.28-rc9' into x86/apic
2008-12-22  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-12-20  Takashi IwaiMerge branch 'topic/ca0106-spdif-stream' into topic...
2008-12-20  Takashi IwaiMerge branch 'topic/ca0106-resume' into topic/ca0106
2008-12-20  Takashi IwaiMerge branch 'topic/ca0106-capture-no-44khz' into topic...
2008-12-20  Takashi IwaiMerge branch 'topic/hda-resume-fix' into topic/hda
2008-12-20  Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
2008-12-19  Jouni Malinenath9k: Fixed RX decryption status reporting
2008-12-19  Jouni Malinenath9k: Fix key cache slot selection for splitmic
2008-12-19  Sujithath9k: Protect config() callback with a mutex
2008-12-19  Jouni Malinenath9k: Key cache allocation for AP mode
2008-12-19  Jouni Malinenath9k: Fix a NULL pointer dereference in ath_rate_get
2008-12-19  Vasanthakumar Thia... ath9k: Move rate control alg register/unregister to...
2008-12-19  Vasanthakumar Thia... ath9k: Synchronize DMA transfer with CPU at right place
2008-12-19  Jouni Malinenath9k: Remove MAC header pad before reporting TX status
2008-12-19  Jouni Malinenath9k: Fix TX status reporting for retries and MCS...
2008-12-19  Jouni Malinenath9k: Report HT rates in RX status
2008-12-19  Sujithath9k: Do not use association state to update rate...
2008-12-19  Sujithmac80211: Fix HT channel selection
2008-12-19  Takashi IwaiMerge branch 'fix/asoc' into for-linus
2008-12-19  Takashi IwaiMerge branch 'topic/hda-doc' into topic/hda
2008-12-19  Takashi IwaiMerge branch 'fix/hda' into topic/hda
2008-12-18  Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-18  Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-16  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-16  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/uv
2008-12-16  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/doc
2008-12-16  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/cpufeature
2008-12-16  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-13  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-12-12  Jouni Malinenath9k: Do not remove header padding on RX from short...
2008-12-12  Sujithath9k: Refactor struct ath_softc
2008-12-12  Senthil Balasubram... ath9k: BH shouldn't be enabled when hardirqs are disabled.
2008-12-12  Johannes Bergath9k: remove fragmentation workaround again
2008-12-12  Senthil Balasubram... ath9k: avoid rx frames with corrupted descriptor.
2008-12-12  Senthil Balasubram... ath9k: Incorrect band enum causes invalid antenna confi...
2008-12-12  Senthil Balasubram... ath9k: Adding support for Atheros AR9285 chipset.
2008-12-12  Senthil Balasubram... ath9k: Adding initvalues for Atheros AR9285 chipset.
2008-12-12  Senthil Balasubram... ath9k: Adding AR9285 chipset register information.
2008-12-12  Sujithath9k: Merge structures ath_atx, ath_node_aggr with...
2008-12-12  Sujithath9k: Remove remaining occurrences of CONFIG_SLOW_ANT_DIV
2008-12-12  Sujithath9k: Add a debugfs file to show interrupt statistics
2008-12-12  Sujithath9k: Maintain rate table choice after association
2008-12-12  Sujithath9k: Fix bug in rate table management
2008-12-12  Jouni Malinenath9k: Disable staggered Beacon frame scheduling
2008-12-12  Jouni Malinenath9k: Free Beacon skbs in AP mode
2008-12-12  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/irq
2008-12-12  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/mm
2008-12-12  Ingo MolnarMerge commit 'v2.6.28-rc8' into sched/core
2008-12-10  Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-12-09  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-12-09  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-12-08  Ingo MolnarMerge branch 'linus' into x86/quirks
2008-12-06  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-06  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-12-05  Luis R. Rodriguezath9k: Use GFP_ATOMIC when allocating TX private area
2008-12-05  Luis R. Rodriguezath9k: Check for pci_map_single() errors
2008-12-05  Wu Fengguanggeneric swap(): ath9k: rename swap() to swap_array()
2008-12-05  Sujithath9k: Choose correct ANI calibration period
2008-12-05  Colin McCabeath9k: Replace ath9k_opmode with nl80211_iftype
2008-12-05  Sujithath9k: Add a debugfs file for dumping DMA status
2008-12-05  Sujithath9k: Add initial layout for an ath9k specific debugfs...
2008-12-05  Sujithath9k: Remove includes that are not needed
2008-12-05  Sujithath9k: Add ATH9K_DEBUG configuration option
2008-12-05  Sujithath9k: Use cleaner debug masks
2008-12-05  Sujithath9k: Handle channel initialization for AP mode
2008-12-05  Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/function...
2008-12-05  Linus TorvaldsMerge branch 'timers-fixes-for-linus' of git://git...
2008-12-05  Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-12-05  Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-12-05  Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-12-05  Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2.6
2008-12-04  James MorrisMerge branch 'master' into next
2008-12-04  Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-12-03  Paul MackerrasMerge branch 'merge'
2008-12-03  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-03  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
next