Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 17 May 2006 21:28:57 +0000 (14:28 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 17 May 2006 21:28:57 +0000 (14:28 -0700)
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] one-line cleanup on set_irq_affinity_info
  [IA64] fix broken irq affinity
  [IA64] sn2 defconfig


Trivial merge