]> err.no Git - linux-2.6/commitdiff
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Jun 2008 18:52:43 +0000 (11:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Jun 2008 18:52:43 +0000 (11:52 -0700)
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix CONFIG_IA64_SGI_UV build error
  [IA64] Update check_sal_cache_flush to use platform_send_ipi()
  [IA64] perfmon: fix async exit bug


Trivial merge