diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-21 21:02:55 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-21 21:02:55 (GMT) |
| commit | afd8c40431cc9e3b468a506cbf9957ffca3466fe (patch) | |
| tree | 7d5b54557a67de132d62fcb0b43184a4969644d0 /Documentation/java.txt | |
| parent | 366f7e7a79b19bd8c4e8f55fdf12b81538d1a7a4 (diff) | |
| parent | c0046867f34bb81ec3f237ebbc5241ae678b8379 (diff) | |
| download | linux-fsl-qoriq-afd8c40431cc9e3b468a506cbf9957ffca3466fe.tar.xz | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (ads1015) Make gain and datarate configurable
hwmon: (ads1015) Drop dynamic attribute group
hwmon: Add support for Texas Instruments ADS1015
hwmon: New driver for SMSC SCH5627
hwmon: (abituguru*) Update my email address
hwmon: (lm75) Speed up detection
hwmon: (lm75) Add detection of the National Semiconductor LM75A
hp_accel: Fix driver name
Move lis3lv02d drivers to drivers/misc
Move hp_accel to drivers/platform/x86
Let Kconfig handle lis3lv02d dependencies
hwmon: (sht15) Fix integer overflow in humidity calculation
hwmon: (sht15) Spelling fix
hwmon: (w83795) Document pin mapping
Diffstat (limited to 'Documentation/java.txt')
0 files changed, 0 insertions, 0 deletions