tree 2b33ae37af2c77fd844243165d00a47450cfc543
parent 90f30eccf41302a2542f5d374af243061902bd98
parent 2e0d232bff31973f58c33412b45fce51b6770698
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1176250917 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1176250917 -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] 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