tree 88727e330f6f936d8850a99e711133bb4c97b8e3
parent 18f2905fcec3e06deafd25a02e37eabaaaaef744
parent c57d68caeed7bc335e6d35c951a9abae733a580b
author Linus Torvalds <torvalds@g5.osdl.org> 1156983131 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1156983131 -0700

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] Increase default nodes shift to 10, nr_cpus to 1024
  [IA64] remove redundant local_irq_save() calls from sn_sal.h
  [IA64] panic if topology_init kzalloc fails
  [IA64-SGI] Silent data corruption caused by XPC V2.