Merge branch 'master' into for-next

This commit is contained in:
Jiri Kosina 2014-02-20 14:54:28 +01:00
commit d4263348f7
10316 changed files with 557400 additions and 217358 deletions

View file

@ -823,8 +823,8 @@ S: D-69231 Rauenberg
S: Germany
N: Jean Delvare
E: [email protected]
W: http://khali.linux-fr.org/
E: [email protected]
W: http://jdelvare.nerim.net/
D: Several hardware monitoring drivers
S: France