aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-21 12:41:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-21 12:41:19 -0700
commitd541b22abde3e71af4b65d79a510b6bc551d5f76 (patch)
tree35041bcaeb0ddac14ce323f927fda2922afc651b /Makefile
parentMerge branch 'kvm-updates/2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm (diff)
parenthwmon: (ad7414) Make ad7414_update_device() static (diff)
downloadlinux-dev-d541b22abde3e71af4b65d79a510b6bc551d5f76.tar.xz
linux-dev-d541b22abde3e71af4b65d79a510b6bc551d5f76.zip
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: hwmon: (ad7414) Make ad7414_update_device() static hwmon: (it87) Fix fan tachometer reading in IT8712F rev 0x7 (I) hwmon: (atxp1) Fix device detection logic
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions