diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-27 15:34:19 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-27 15:34:19 -0500 |
| commit | 0b711cac8b9e604c93b32ca6e0b6b73261056d65 (patch) | |
| tree | fb3b8ebfe11689ae46150b259ae292d2b49a0ab3 /net/ipv4/tcp_htcp.c | |
| parent | b17b849946e581ad58af74933d4fb63ad8812937 (diff) | |
| parent | a20f0bc10c47fcf62be027e1a50b62791052ab56 (diff) | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
hwmon: (lis3) turn down the no IRQ message
hwmon: (asus_atk0110) Override interface detection on Sabertooth X58
hwmon: (applesmc) Properly initialize lockdep attributes
Diffstat (limited to 'net/ipv4/tcp_htcp.c')
0 files changed, 0 insertions, 0 deletions