Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 21:50:53 +0000 (14:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 21:50:53 +0000 (14:50 -0700)
commit535e0c1726bec699a8f0f5b86fe7d399546b2555
tree9aa71d6908e4255b5a864cdae14ef164dea66665
parent0edfa2b1b5a5e1475e76dd3c792447687d966de4
parent5afe18d2f58812f3924edbd215464e5e3e8545e7
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 csum_ipv6_magic()
  [IA64] Fix warning in dma-mapping.c