diff options
author | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 14:36:26 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 14:36:26 +0200 |
commit | fa2bd30159499f441125495ba8d9d57f646ea42a (patch) | |
tree | f5afca7fb3bcccc81f74889adc44c08563dceb40 /drivers/hwmon/ina2xx.c | |
parent | 1ad346a9f8ca0d266ddbfdbbbd8913782b417f35 (diff) | |
parent | 4fe9f8e203fdad1524c04beb390f3c6099781ed9 (diff) | |
parent | a80fe5d6e3190f65be8cc7efa487f187eb3dbffa (diff) | |
parent | 56fa94415b8a1a163e24a105fb5bdadc625c1d2a (diff) | |
parent | 5844c1cdb630b537a2ecdf74dab2985e51dc1bd9 (diff) | |
parent | eb4e426a480ce99004134ee22e6a3b7ab88f979c (diff) | |
parent | 8908dd806340513dacfd37b21e047946bca995d1 (diff) | |
parent | a2f6e4e009f13097acafd09cccf274fb5869dde2 (diff) |
Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogic', 'wacom' and 'wiimote' into for-linus