summaryrefslogtreecommitdiffstats
path: root/kernel/watchdog.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-07-25 00:06:59 -0700
committerDavid S. Miller <davem@davemloft.net>2013-07-25 00:06:59 -0700
commit1df86b4ceec84dbf264fbeada9e2afff5e86c2c9 (patch)
tree84cb57b36d2e6e52d6154e3c313f899be534db37 /kernel/watchdog.c
parentdeceb4c062a8dd63fe554c3be2b4bf9151a5cedf (diff)
parent18e1ccb6ca35f995006749d20d9bd6ef40d736fd (diff)
downloadblackbird-op-linux-1df86b4ceec84dbf264fbeada9e2afff5e86c2c9.tar.gz
blackbird-op-linux-1df86b4ceec84dbf264fbeada9e2afff5e86c2c9.zip
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says: ==================== This is another batch of fixes intended for the 3.11 stream. FWIW, this is the first request with fixes from the mac80211 and iwlwifi trees as well. Regarding the mac80211 bits, Johannes says: "Here I have a fix for RSSI thresholds in mesh, two minstrel fixes from Felix, an nl80211 fix from Michal and four various fixes I did myself." As for the iwlwifi bits, Johannes says: "Here I have a fix for debugfs directory creation (causing a spurious error message), two scanning fixes from David Spinadel, an LED fix and two patches related to a BA session problem that eventually caused firmware crashes from Emmanuel and a small BT fix for older devices as well as a workaround for a firmware problem with APs with very small beacon intervals from myself." Along with those: Arend van Spriel addresses a lock-up and a NULL pointer dereference in brcmfmac. Daniel Drake fixes an unhandled interrupt during device tear down in mwifiex. Larry Finger corrects a wil6210 build error. Oleksij Rempel fixes two ath9k_htc problems related to keeping the driver and firmware in sync. Solomon Peachy gives us a cw1200 fix to avoid an oops in monitor mode. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/watchdog.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud