Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <[email protected]>
Thu, 12 Jul 2007 23:46:01 +0000 (16:46 -0700)
committerLinus Torvalds <[email protected]>
Thu, 12 Jul 2007 23:46:01 +0000 (16:46 -0700)
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Un-break ia64 build


Trivial merge