summaryrefslogtreecommitdiff
path: root/drivers/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-13 11:01:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-13 11:01:03 -0700
commitac7d181e323a888015e19e2e4d776095a0433787 (patch)
tree014519b18f078b0171c1bf1e1bb54157a8ad073e /drivers/crypto
parent4264e6a263fc7166a5aa5234819b94f6fc9a2cd2 (diff)
parent41002f8dd5938d5ad1d008ce5bfdbfe47fa7b4e8 (diff)
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Please pull one hwmon subsystem fix from Jean Delvare. * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (it87) Preserve configuration register bits on init
Diffstat (limited to 'drivers/crypto')
0 files changed, 0 insertions, 0 deletions