summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafa...Linus Torvalds2009-09-3018-57/+65
|\
| * PM / yenta: Fix cardbus suspend/resume regressionRafael J. Wysocki2009-09-291-40/+48
| * PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()Rafael J. Wysocki2009-09-2918-18/+18
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-09-3038-11045/+6792
|\ \
| * \ Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2009-09-2819-235/+274
| |\ \
| | * | sony-laptop: re-read the rfkill state when resuming from suspendAlan Jenkins2009-09-281-0/+3
| | * | sony-laptop: check for rfkill hard block at load timeAlan Jenkins2009-09-281-0/+6
| | * | wext: add back wireless/ dir in sysfs for cfg80211 interfacesJohannes Berg2009-09-283-8/+7
| | * | wext: Add bound checks for copy_from_userArjan van de Ven2009-09-281-3/+6
| | * | mac80211: improve/fix mlme messagesJohannes Berg2009-09-281-9/+9
| | * | cfg80211: always get BSSJohannes Berg2009-09-281-3/+2
| | * | iwlwifi: fix 3945 ucode info retrieval after failureReinette Chatre2009-09-2811-204/+229
| | * | iwlwifi: fix memory leak in command queue handlingReinette Chatre2009-09-281-0/+6
| | * | iwlwifi: fix debugfs buffer handlingReinette Chatre2009-09-281-3/+3
| | * | cfg80211: don't set privacy w/o keyJohannes Berg2009-09-281-1/+2
| | * | cfg80211: wext: don't display BSSID unless associatedJohannes Berg2009-09-281-4/+1
| * | | net: Add explicit bound checks in net/socket.cArjan van de Ven2009-09-281-1/+6
| * | | bridge: Fix double-free in br_add_if.Jeff Hansen2009-09-281-0/+1
| * | | isdn: fix netjet/isdnhdlc build errorsRandy Dunlap2009-09-282-2/+2
| * | | atm: dereference of he_dev->rbps_virt in he_init_group()Juha Leppanen2009-09-281-7/+7
| * | | ax25: Add missing dev_put in ax25_setsockoptRalf Baechle2009-09-281-9/+10
| |/ /
| * | Revert "sit: stateless autoconf for isatap"Sascha Hlusiak2009-09-264-67/+1
| * | net: fix double skb free in dcbnlJohn Fastabend2009-09-261-8/+7
| * | net: fix nlmsg len size for skb when error bit is set.John Fastabend2009-09-261-1/+1
| * | net: fix vlan_get_size to include vlan_flags sizeJohn Fastabend2009-09-261-0/+1
| * | e1000: cleanup unused prototypeDon Skidmore2009-09-261-1/+0
| * | e1000: fix namespacecheck warningsJesse Brandeburg2009-09-262-15/+1
| * | e1000: drop unused functionality for eeprom write/readJesse Brandeburg2009-09-262-120/+3
| * | e1000: updated whitespace and commentsJesse Brandeburg2009-09-263-6229/+6337
| * | e1000: drop redunant line of code, cleanupJesse Brandeburg2009-09-261-8/+4
| * | e1000: remove races when changing mtuJesse Brandeburg2009-09-261-2/+14
| * | e1000: two workarounds were incomplete, fix themJesse Brandeburg2009-09-261-7/+10
| * | e1000: fix tx waking queue after queue stopped during shutdownJesse Brandeburg2009-09-261-6/+9
| * | e1000: test link state conclusivelyJesse Brandeburg2009-09-264-77/+157
| * | e1000: stop timers at appropriate timesJesse Brandeburg2009-09-261-7/+19
| * | e1000: use netif_tx_disableJesse Brandeburg2009-09-261-2/+1
| * | e1000: remove unused functionsJesse Brandeburg2009-09-262-174/+2
| * | e1000: drop dead pcie code from e1000Jesse Brandeburg2009-09-266-4335/+193
* | | Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airl...Linus Torvalds2009-09-3037-691/+2117
|\ \ \
| * | | drm/radeon/kms: Convert R520 to new init path and associated cleanupJerome Glisse2009-09-295-128/+376
| * | | drm/radeon/kms: Convert RV515 to new init path and associated cleanupJerome Glisse2009-09-2911-158/+712
| * | | drm: fix radeon DRM warnings when !CONFIG_DEBUG_FSMikael Pettersson2009-09-291-4/+3
| * | | drm: fix drm_fb_helper warning when !CONFIG_MAGIC_SYSRQMikael Pettersson2009-09-291-0/+2
| * | | drm/r600: fix memory leak introduced with 64k malloc avoidance fix.Dave Airlie2009-09-281-0/+2
| * | | drm/kms: make fb helper work for all drivers.Dave Airlie2009-09-283-26/+43
| * | | drm/radeon/r600: fix offset handling in CS parserAlex Deucher2009-09-261-5/+5
| * | | drm/radeon/kms/r600: fix forcing pci mode on agp cardsAlex Deucher2009-09-261-4/+7
| * | | drm/radeon/kms: fix for the extra pages copying.Dave Airlie2009-09-261-3/+1
| * | | drm/radeon/kms/r600: add support for vline relocsAlex Deucher2009-09-263-1/+128
| * | | drm/radeon/kms: fix some bugs in vline relocAlex Deucher2009-09-261-6/+5