Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <[email protected]>
Wed, 24 Feb 2010 18:51:04 +0000 (10:51 -0800)
committerLinus Torvalds <[email protected]>
Wed, 24 Feb 2010 18:51:04 +0000 (10:51 -0800)
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix broken sn2 build


Trivial merge