path: root/block
diff options
authorLinus Torvalds <>2007-12-17 19:29:41 -0800
committerLinus Torvalds <>2007-12-17 19:29:41 -0800
commitc63a1190368771b8207d86c4217ae4afdf1cbd5e (patch)
treeb92409d027dbb1fdef33242b964d0105fc4ef4ad /block
parentededa4d396b15c282aa60d6aacddfc07f0142dbf (diff)
parent8085106a58366fb2c6c14d89e3d4395d2702d4a1 (diff)
Merge branch 'upstream-linus' of git://
* 'upstream-linus' of git:// (23 commits) iwlwifi: fix rf_kill state inconsistent during suspend and resume b43: Fix rfkill radio LED bcm43xx_debugfs sscanf fix libertas: select WIRELESS_EXT iwlwifi3945/4965: fix rate control algo reference leak ieee80211_rate: missed unlock wireless/ipw2200.c: add __dev{init,exit} annotations zd1211rw: Fix alignment problems libertas: add Dan Williams as maintainer sis190 endianness ucc_geth: really fix section mismatch pcnet_cs: add new id ixgb: make sure jumbos stay enabled after reset Net: ibm_newemac, remove SPIN_LOCK_UNLOCKED net: smc911x: shut up compiler warnings ucc_geth: minor whitespace fix drivers/net/s2io.c section fixes drivers/net/sis190.c section fix hamachi endianness fixes e100: free IRQ to remove warningwhenrebooting ...
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions