Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Nov 2006 01:03:50 +0000 (17:03 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Nov 2006 01:03:50 +0000 (17:03 -0800)
commitd5b9b787b5e1618dfe82a2c2a6972374e85b02db
tree42fa7b4e4381e40fc94ae41fd932f9b7b1abece6
parent16b7b2ac0148e839da86af8747b6fa4aad43a9b7
parent024e4f2c5175a482c234cf67ed22368d770bf78f
Merge branch 'release' of /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