Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Oct 2006 18:08:57 +0000 (11:08 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Oct 2006 18:08:57 +0000 (11:08 -0700)
commit428929a234d2c4b8a6d0145d0dcf687fcfa27325
treedd097eeabbd41c4713be5ea7663f52399183fd84
parent0cd61b68c340a4f901a06e8bb5e0dea4353161c0
parent8c1addbc752660e95bbf2128d66b8e5bb38d5fc7
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix breakage from irq change