Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 May 2010 18:41:52 +0000 (11:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 May 2010 18:41:52 +0000 (11:41 -0700)
commitcf77e988ddfc7f047ac1ddc72cadb5eee7e09293
treed4870b7290ea50fe01ed4d56febad449f1206172
parent1d3c6ff44ad4b5f113602e153026a338f0f9b3ff
parent2a2ae2426bba944ce6dbcad35e1580df57aafcf1
Merge branch 'release' of git://git./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