Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 May 2010 00:46:47 +0000 (17:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 May 2010 00:46:47 +0000 (17:46 -0700)
commit9dda696f0de87a2e5cfabb147e28c76b7d3c6846
tree862a9fa39ce2d33156b815e1f7352038287579bf
parentc5617b200ac52e35f7e8cf05a17b0a2d50f6b3e9
parent4ec37de89d8c758ee8115e0e64b3f994910789ee
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 build breakage