summaryrefslogtreecommitdiffstats
path: root/drivers/thermal/step_wise.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-05-09 16:46:53 -0400
committerDavid S. Miller <davem@davemloft.net>2014-05-09 16:46:53 -0400
commit1448eb566970c6d3cade522419848fdaee24c684 (patch)
treeb11b67b20f823125597c2a8f726b677f3cab4b26 /drivers/thermal/step_wise.c
parenta9de0500083c18589ba2ea4543135c1bea8419ec (diff)
parent6153871f77f8fa778cd0cf1e2979db75e25d3532 (diff)
downloadblackbird-op-linux-1448eb566970c6d3cade522419848fdaee24c684.tar.gz
blackbird-op-linux-1448eb566970c6d3cade522419848fdaee24c684.zip
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says: ==================== pull request: wireless 2014-05-08 This one is all from Johannes: "Here are a few small fixes for the current cycle: radiotap TX flags were wrong (fix by Bob), Chun-Yeow fixes an SMPS issue with mesh interfaces, Eliad fixes a locking bug and a cfg80211 state problem and finally Henning sent me a fix for IBSS rate information." Please let me know if there are problems! ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/thermal/step_wise.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud