diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 14:14:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 14:14:10 -0400 |
| commit | 1faa6ec8ccbde8c4f0237be80473a4294ebf8289 (patch) | |
| tree | 7348fad546bbedddcb83d1282d9815e7e0fd2e15 /include/linux/atmel_tc.h | |
| parent | 79637a41e466bbe7dfe394bac3c9d86a92fd55b1 (diff) | |
| parent | 1389298f7d14f179c2fa4b4b343079bd56082c70 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, mcheck: Avoid duplicate sysfs links/files for thresholding banks
io-mapping: Fix the address space annotations
x86: Fix the address space annotations of iomap_atomic_prot_pfn()
x86, mm: Fix CONFIG_VMSPLIT_1G and 2G_OPT trampoline
x86, hwmon: Fix unsafe smp_processor_id() in thermal_throttle_add_dev
Diffstat (limited to 'include/linux/atmel_tc.h')
0 files changed, 0 insertions, 0 deletions