diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-07 10:54:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-07 10:54:19 -0700 |
| commit | 7b4022fa17991801e29f09c6794bbf4d1a0d6b6d (patch) | |
| tree | 39e1597430fb99407b491c888d6ac6d9fe7fa81c /drivers/crypto/nx/nx-aes-ecb.c | |
| parent | 27c7651a6a5f143eccd66db38c7a3035e1f8bcfb (diff) | |
| parent | 94e44413cdda7b1b838a4c508a4eca0cdd5e7a18 (diff) | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon fixes from Jean Delvare.
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (emc6w201) Do not declare enum variable
hwmon: (w83792d) Update module author
Diffstat (limited to 'drivers/crypto/nx/nx-aes-ecb.c')
0 files changed, 0 insertions, 0 deletions