linux/drivers/hwmon
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
ams
Kconfig
Makefile
abituguru.c
abituguru3.c
ad7414.c
ad7418.c
adcxx.c
adm1021.c
adm1025.c
adm1026.c
adm1029.c
adm1031.c
adm9240.c
ads7828.c
ads7871.c
adt7411.c
adt7462.c
adt7470.c
adt7475.c
amc6821.c
applesmc.c
asb100.c
asc7621.c
asus_atk0110.c
atxp1.c
coretemp.c
dme1737.c
ds1621.c
emc1403.c
emc2103.c
f71805f.c
f71882fg.c
f75375s.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
fschmd.c
g760a.c
gl518sm.c
gl520sm.c
hdaps.c
hp_accel.c
hwmon-vid.c
hwmon.c
i5k_amb.c
ibmaem.c
ibmpex.c
it87.c
jc42.c
jz4740-hwmon.c
k8temp.c
k10temp.c
lis3lv02d.c
lis3lv02d.h
lis3lv02d_i2c.c
lis3lv02d_spi.c
lm63.c
lm70.c
lm73.c
lm75.c
lm75.h
lm77.c
lm78.c
lm80.c
lm83.c
lm85.c
lm87.c
lm90.c
lm92.c
lm93.c
lm95241.c
ltc4215.c
ltc4245.c
max1111.c
max1619.c
max6650.c
mc13783-adc.c
pc87360.c
pc87427.c
pcf8591.c
pkgtemp.c
s3c-hwmon.c
sht15.c
sis5595.c
smm665.c
smsc47b397.c
smsc47m1.c
smsc47m192.c
thmc50.c
tmp102.c
tmp401.c
tmp421.c
ultra45_env.c
via-cputemp.c
via686a.c
vt1211.c
vt8231.c
w83l785ts.c
w83l786ng.c
w83627ehf.c
w83627hf.c
w83781d.c
w83791d.c
w83792d.c
w83793.c
wm831x-hwmon.c
wm8350-hwmon.c