aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/wimax
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-11 11:23:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-11 11:23:33 -0700
commit4c274fff4fa03cf2509e1b01d3712de6131bfa50 (patch)
tree7a1c32af08c3eb559154f2340431b8de178b167b /Documentation/wimax
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff)
parenthwmon: (s3c-hwmon) Disable build for S3C64xx (diff)
downloadlinux-dev-4c274fff4fa03cf2509e1b01d3712de6131bfa50.tar.xz
linux-dev-4c274fff4fa03cf2509e1b01d3712de6131bfa50.zip
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: (s3c-hwmon) Disable build for S3C64xx MAINTAINERS: Fix Riku Voipio's address hwmon: (asus_atk0110) Enable the EC hwmon: (asus_atk0110) Refactor the code hwmon: (sht15) Fix spurious section mismatch warning
Diffstat (limited to 'Documentation/wimax')
0 files changed, 0 insertions, 0 deletions