From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 19 May 2010 18:41:52 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: MMI-PSA29.97-13-9~23902
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cf77e988ddfc7f047ac1ddc72cadb5eee7e09293;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

cf77e988ddfc7f047ac1ddc72cadb5eee7e09293