From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 11 Apr 2007 00:21:57 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.21-rc7~33
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b4dfd6bc35f6c1e0fcbb4268c523b3939955d3af;p=~emulex%2Finfiniband.git

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] SGI Altix : fix pcibr_dmamap_ate32() bug
  [IA64] Fix CPU freq displayed in /proc/cpuinfo
  [IA64] Fix wrong assumption about irq and vector in msi_ia64.c
  [IA64] BTE error timer fix
---

b4dfd6bc35f6c1e0fcbb4268c523b3939955d3af