diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-12 02:38:04 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-12 02:38:04 +0200 |
commit | cea0d767c29669bf89f86e4aee46ef462d2ebae8 (patch) | |
tree | e7f65605979547a2ecfd2ec26e9374cbe25ff1a7 /arch/microblaze/include/asm/pci.h | |
parent | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | hwmon: (applesmc) Correct sysfs fan error handling (diff) | |
download | linux-cea0d767c29669bf89f86e4aee46ef462d2ebae8.tar.xz linux-cea0d767c29669bf89f86e4aee46ef462d2ebae8.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: (applesmc) Correct sysfs fan error handling
hwmon: (asc7621) Bug fixes
Diffstat (limited to 'arch/microblaze/include/asm/pci.h')
0 files changed, 0 insertions, 0 deletions