diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 20:41:52 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 20:41:52 +0200 |
commit | cf77e988ddfc7f047ac1ddc72cadb5eee7e09293 (patch) | |
tree | d4870b7290ea50fe01ed4d56febad449f1206172 /kernel | |
parent | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | [IA64] Drop duplicated "config IOMMU_HELPER" (diff) | |
download | linux-cf77e988ddfc7f047ac1ddc72cadb5eee7e09293.tar.xz linux-cf77e988ddfc7f047ac1ddc72cadb5eee7e09293.zip |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Drop duplicated "config IOMMU_HELPER"
[IA64] invoke oom-killer from page fault
[IA64] use __ratelimit
[IA64] Use set_cpus_allowed_ptr
[IA64] Use set_cpus_allowed_ptr
[IA64] arch/ia64/hp/common/sba_iommu.c: Rename dev_info to adi
[IA64] removing redundant ifdef
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions