summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-6000.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-03 17:08:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-03 17:08:58 -0700
commit913a90416918a591e6d5ece036b795c58a08131d (patch)
treef33a75b6d08ffe24ddcc57e35635d0f7ee37693f /drivers/net/wireless/iwlwifi/iwl-6000.c
parentac001e76546523ec2ef05b2f7001d8fdc588d069 (diff)
parentbdc71c9a87b898e4c380c23b2e3e18071312ecde (diff)
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck: "Fix OOPS seen in coretemp driver if the CPU core ID is too large" * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (coretemp) Increase CPU core limit hwmon: (coretemp) fix oops on cpu unplug
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
0 files changed, 0 insertions, 0 deletions