[XFS] Fix merge failures
[linux-2.6] / drivers / net / wireless /
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/prism54: fix sparse warnings:...
2008-12-26  Hannes Ederdrivers/net/wireless/ipw2x00: fix sparse warnings:...
2008-12-26  Hannes Ederdrivers/net/wireless/b43: fix sparse warnings: make...
2008-12-26  Hannes Ederdrivers/net/wireless/ath9k: fix sparse warnings: make...
2008-12-26  Hannes Ederdrivers/net/wireless: fix sparse warnings: make symbols...
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-25  James MorrisMerge branch 'next' into for-linus
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  Lachlan McIlroy[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
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  Michael Bueschb43: Add key memory dumping
2008-12-19  Michael Bueschb43: Suspend MAC while killing the radio
2008-12-19  Bob Copelandath5k: correct packet length in tx descriptors
2008-12-19  Michael Bueschb43: Fix some MAC locking
2008-12-19  Rami Roseniwlwifi: iwl-tx.c cleanup (remove unused parameter...
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  Christian Lamparterp54usb: bring first generation devices back to life
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  Jay Sternbergiwlwifi: indicate txpower is off in sysfs
2008-12-19  Zhu Yiiwlwifi: use GFP_KERNEL to allocate Rx SKB memory
2008-12-19  Wu, Fengguangiwlwifi: use meaningful vars in _iwl_poll_bit()
2008-12-19  Wu Fengguangiwlwifi: remove useless goto
2008-12-19  Wu, Fengguangiwlwifi: use type uint for module param debug
2008-12-19  Wu, Fengguangiwlwifi: update comments on the debug interface
2008-12-19  Wu, Fengguangiwlwifi: add line feed to printk
2008-12-19  Winkler, Tomasiwlwifi: cleanup iwl-dev.h
2008-12-19  Rami Roseniwlwifi: remove a parameter (dest) from *_fill_beacon_f...
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  Herton Ronaldo Krz... rtl8187: Fix crash on unload when using SLUB debug
2008-12-19  Christian Lamparterp54: remove free_on_tx parameter
2008-12-19  Christian Lamparterp54: more accurate rssi to dBm conversion
2008-12-19  Larry Fingerrtl8187: Fix error returns
2008-12-19  Ilpo Järvinenlibertas: use roundup instead of opencoding
2008-12-19  Christian Lamparterp54: update ACK failure statistic counter in real-time
2008-12-19  Christian Lamparterp54: move statistic timer update routine into a workqueue
2008-12-19  Mohamed Abbasiwlagn: fix agn rate scaling
2008-12-19  Benoit PAPILLAULTath5k: fix 802.11 header padding on RX, unpadding on TX
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  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-12-19  Takashi IwaiMerge branch 'fix/asoc' into for-linus
2008-12-19  Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/ring-buffer...
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-19  Wang Chennetdevice zd1201: Use after free
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-18  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-12-17  Paul MackerrasMerge branch 'next' of /linux/kernel/git/jwboyer/powerp...
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-16  Paul MackerrasMerge branch 'merge' into next
2008-12-15  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-12-13  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-12-13  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-12-12  Tomas Winkleriwlwifi: add contact email to MODULE_AUTHOR
2008-12-12  Tomas Winkleriwlwifi: remove 4965 from common uCode API structures
2008-12-12  Tomas Winkleriwlwifi: remove includes of iwl-helpers.h where not...
2008-12-12  Tomas Winkleriwlwifi: remove unused clip_groups priv member
2008-12-12  Mohamed Abbasiwlwifi: fix resume while txpower off
2008-12-12  Zhu, Yiiwlwifi: use iwl_poll_direct_bit in EEPROM reading
2008-12-12  Jouni Malinenath9k: Do not remove header padding on RX from short...
2008-12-12  Rami Roseniwlwifi: fix build warning (iwl-rx.c)
2008-12-12  Anna Neallibertas: Create sysfs entry for changing the mesh...
next