| commit | cf77e988ddfc7f047ac1ddc72cadb5eee7e09293 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 19 11:41:52 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 19 11:41:52 2010 -0700 |
| tree | d4870b7290ea50fe01ed4d56febad449f1206172 | |
| parent | 1d3c6ff44ad4b5f113602e153026a338f0f9b3ff [diff] | |
| parent | 2a2ae2426bba944ce6dbcad35e1580df57aafcf1 [diff] |
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