ucc_geth: Fix sneaky merge conflict regarding bus_id
[linux-2.6] / drivers / net / wireless / libertas /
2008-04-19  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-19  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6.26
2008-04-18  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-04-18  Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2008-04-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-18  David S. MillerMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-17  David S. MillerMerge branch 'upstream-net26' of /linux/kernel/git...
2008-04-17  Tony LuckPull miscellaneous into release branch
2008-04-17  Tony LuckPull nptcg into release branch
2008-04-17  Tony LuckPull kvm-patches into release branch
2008-04-17  Tony LuckPull percpureserve into release branch
2008-04-17  Tony LuckPull regset into release branch
2008-04-17  Tony LuckPull virt-cpu-accounting into release branch
2008-04-17  Tony LuckPull fsys_gettimeofday into release branch
2008-04-17  David S. MillerMerge branch 'master' of /linux/kernel/git/linville...
2008-04-16  Holger Schuriglibertas: un-garbage various command structs
2008-04-16  Holger Schuriglibertas: convert libertas driver to use an event/cmdre...
2008-04-14  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-04-14  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-04-14  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-04-11  Linus TorvaldsMerge branch 'docs' of git://git.lwn.net/linux-2.6
2008-04-11  Linus TorvaldsMerge branch 'i2c-for-linus' of git://jdelvare.pck...
2008-04-11  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-11  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-04-09  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-04-08  Holger Schuriglibertas: remove lbs_get_fwversion()
2008-04-08  Holger Schuriglibertas: move lbs_update_channel out of assoc.c
2008-04-08  Holger Schuriglibertas: move association code from scan.c into assoc.c
2008-04-08  Holger Schuriglibertas: move association code from join.c into scan.c
2008-04-08  David S. MillerMerge branch 'net-2.6.26-isatap-20080403' of git:/...
2008-04-08  Holger Schuriglibertas: fix mode initialization problem
2008-04-07  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-04-04  Linus TorvaldsMerge branch 'upstream' of git://git./linux/kernel...
2008-04-03  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-03  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-04-03  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-04-03  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-04-02  Linus TorvaldsMerge git://git./linux/kernel/git/bart/ide-2.6
2008-04-02  Linus TorvaldsMerge git://git./linux/kernel/git/mchehab/v4l-dvb
2008-04-02  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-04-02  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-04-02  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-01  Holger Schuriglibertas: don't depend on IEEE80211
2008-04-01  Holger Schuriglibertas: convert sleep/wake config direct commands
2008-04-01  Holger Schuriglibertas: convert CMD_802_11_EEPROM_ACCESS to a direct...
2008-04-01  Holger Schuriglibertas: convert CMD_802_11_MAC_ADDRESS to a direct...
2008-04-01  Dmitry TorokhovMerge /linux/kernel/git/torvalds/linux-2.6 into for...
2008-03-28  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-28  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-28  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-27  Holger Schuriglibertas: reduce debug output
2008-03-27  Holger Schuriglibertas: remove CMD_802_11_PWR_CFG
2008-03-27  Holger Schuriglibertas: kill useless #define LBS_MONITOR_OFF 0
2008-03-27  Holger Schuriglibertas: fix spinlock recursion bug
2008-03-27  Linus TorvaldsMerge branch 'avr32-fixes' of git://git./linux/kernel...
2008-03-27  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-26  David S. MillerMerge branch 'net-2.6.26-netns-20080326' of git://git...
2008-03-26  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-25  Holger Schuriglibertas: store rssi as an u32
2008-03-25  Holger Schuriglibertas: remove lots of unused stuff
2008-03-25  Holger Schuriglibertas: misc power saving adjusts
2008-03-25  Holger Schuriglibertas: convert GET_LOG to a direct command
2008-03-25  Holger Schuriglibertas: fix scheduling while atomic bug in CMD_MAC_CO...
2008-03-25  Holger Schuriglibertas: make a handy lbs_cmd_async() command
2008-03-25  Holger Schuriglibertas: remove some unused commands
2008-03-25  Holger Schuriglibertas: rename packetfilter to mac_control
2008-03-25  Holger Schuriglibertas: convert CMD_MAC_CONTROL to a direct command
2008-03-24  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-24  David S. MillerMerge branch 'master' of ../net-2.6/
2008-03-23  David S. MillerMerge branch 'upstream-net26' of /linux/kernel/git...
2008-03-21  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-21  Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6.25
2008-03-21  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-20  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-03-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-18  Len BrownMerge branches 'release' and 'dock' into release
2008-03-18  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-16  Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-03-14  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-14  Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-03-13  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-13  Holger Schuriglibertas: implement SSID scanning for SIOCSIWSCAN
2008-03-13  Len BrownMerge branches 'release' and 'doc' into release
2008-03-13  Len BrownMerge branches 'release', 'ejd', 'sony' and 'wmi' into...
2008-03-13  Len BrownMerge branches 'release', 'button-sysfs', 'misc', ...
2008-03-13  Len BrownMerge branches 'release' and 'thermal' into release
2008-03-13  Len BrownMerge branches 'release', 'bugzilla-8570', 'bugzilla...
2008-03-13  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-03-13  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-03-12  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-03-12  Paul MackerrasMerge branch 'master' of git://git./linux/kernel/git...
2008-03-12  David S. MillerMerge branch 'master' of /linux/kernel/git/linville...
2008-03-11  Sebastian Siewiorlibertas: fix the 'compare command with itself' properly
2008-03-11  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-09  Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-03-07  Linus TorvaldsMerge branch 'hotfixes' of git://git.linux-nfs.org...
2008-03-06  David Woodhouselibertas: clean up scan.c, remove zeromac and bcastmac
2008-03-06  David Woodhouselibertas: convert 802_11_SCAN to a direct command
2008-03-06  David Woodhouselibertas: add LED control TLV to types.h
2008-03-06  David Woodhouselibertas: convert KEY_MATERIAL to a direct command
next