[XFS] Fix merge failures
[linux-2.6] / drivers / net / wireless / rt2x00 /
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-25  Takashi IwaiMerge branch 'topic/snd-hrtimer' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/jack-mechanical' 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 branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
2008-12-20  Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
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-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/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-12  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/mm
2008-12-09  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
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  Ivo van Doornrt2x00: Correctly initialize AID during set_key()
2008-12-05  Ivo van Doornrt2x00: Move crypto TX descriptor handling to rt2x00cry...
2008-12-05  Ivo van Doornrt2x00: Fix check for BSS info changes
2008-12-05  Ivo van Doornrt2x00: Add RXDONE_CRYPTO_IV/ICV flags
2008-12-05  Ivo van Doornrt2x00: Release rt2x00 2.2.3
2008-12-05  Ivo van Doornrt2x00: Implement HW encryption (rt2500usb)
2008-12-05  Ivo van Doornrt2x00: Remove duplicate code
2008-12-05  Ivo van Doornrt2x00: Store retry limit values
2008-12-05  Ivo van Doornrt2x00: Optimize IV/EIV handling
2008-12-04  Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-12-03  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-03  Ingo MolnarMerge commit 'v2.6.28-rc7'; branch 'x86/dumpstack'...
2008-12-03  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-01  Takashi IwaiMerge branch 'upstream' into topic/asoc
2008-11-30  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-28  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-11-27  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-26  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-11-26  Ivo van Doornrt2x00: Don't switch off LED on initialization
2008-11-26  Takashi IwaiMerge branch 'topic/misc' into topic/pcsp-fix
2008-11-25  Ivo van Doornrt2x00: Detect USB BULK in/out endpoints
2008-11-25  Ivo van Doornrt2x00: Fix TX failure path
2008-11-25  Ivo van Doornrt2x00: Move rt73usb register access wrappers into...
2008-11-25  Ivo van Doornrt2x00: Cleanup indirect register access
2008-11-25  Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-24  Paul MackerrasMerge branch 'merge' of git://git./linux/kernel/git...
2008-11-23  Ingo MolnarMerge commit 'v2.6.28-rc6' into x86/debug
2008-11-22  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-11-21  Ivo van Doornrt2x00: Fix race condition when using inderect registers
2008-11-21  Ivo van Doornrt2x00: Optimize get_duration / get_duration_res
2008-11-21  Ivo van Doornrt2x00: Cleanup TX/RX entry handling
2008-11-21  Ivo van Doornrt2x00: Fix BUG_ON() with antenna handling
2008-11-21  Ivo van Doornrt2x00: Block set_key() during suspend/shutdown
2008-11-21  Ivo van Doornrt2x00: Fix LED state handling
2008-11-21  Ivo van Doornrt2x00: Remove RATE_BASIC flag
2008-11-21  Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/sound...
2008-11-21  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-20  Ingo MolnarMerge branch 'linus' into x86/memory-corruption-check
2008-11-20  Ingo MolnarMerge branch 'linus' into x86/uv
2008-11-19  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-18  Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-11-16  Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-11-12  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-12  Ingo MolnarMerge branch 'linus' into x86/crashdump
2008-11-12  Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-12  Len BrownMerge branch 'sony' into release
2008-11-12  Len BrownMerge branch 'power' into release
2008-11-12  Len BrownMerge branch 'misc' into release
2008-11-12  Len BrownMerge branch 'bugzilla-11539' into release
2008-11-12  Len BrownMerge branch 'bugzilla-11312' into release
2008-11-11  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-10  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-11-10  Ivo van Doornrt2x00: Remove debugfs CSR access wrappers
2008-11-10  Ivo van Doornrt2x00: Release rt2x00 2.2.2
2008-11-10  Ivo van Doornrt2x00: Improve interface_modes initialization
2008-11-10  Ivo van Doornrt2x00: Remove ieee80211_bss_conf from rt2x00_intf
2008-11-10  Ivo van Doornrt2x00: Optimize configuration handling
2008-11-10  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-10  Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-11-10  Ingo MolnarMerge commit 'v2.6.28-rc4' into x86/apic
2008-11-10  Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-11-09  Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-11-08  Ingo MolnarMerge branch 'linus' into x86/cleanups
2008-11-07  Ingo MolnarMerge branch 'oprofile-for-tip' of git://git./linux...
2008-11-07  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-07  Niv SardiMerge branch 'master' of git://oss.sgi.com:8090/xfs...
2008-11-06  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-06  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-11-06  Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
2008-11-05  James MorrisMerge branch 'master' into next
2008-11-03  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-11-03  Linus TorvaldsMerge branch 'io-mappings-for-linus-2' of git://git...
2008-11-03  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-03  Linus TorvaldsMerge branch 'proc-linus' of git://git./linux/kernel...
2008-11-03  Linus TorvaldsMerge branch 'drm-next' of git://git./linux/kernel...
2008-11-03  Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-11-03  Ingo MolnarMerge branches 'tracing/ftrace', 'tracing/markers'...
next