From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 1 Nov 2006 01:03:50 +0000 (-0800)
Subject: Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.19-rc5~88
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d5b9b787b5e1618dfe82a2c2a6972374e85b02db;p=linux-2.6-omap-h63xx.git

Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Correct definition of handle_IPI
  [IA64] move SAL_CACHE_FLUSH check later in boot
  [IA64] MCA recovery: Montecito support
  [IA64] cpu-hotplug: Fixing confliction between CPU hot-add and IPI
  [IA64] don't double >> PAGE_SHIFT pointer for /dev/kmem access
---

d5b9b787b5e1618dfe82a2c2a6972374e85b02db