Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
commitba933beb11b46b6d90d53b7220858148d8687ab1
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Mar 2009 17:13:28 +0000 (8 10:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Mar 2009 17:13:28 +0000 (8 10:13 -0700)
tree57ee9e36973d8cc560eedcc0e5ff10b63bd0c69b
parent81d1ab82c045fd4d2f3c803147f0a1c6bd2015fc
parentc63c58056e268b0d6bd6994b69030c144567990d
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 PCI DMA flag propagation on SN (Altix) with PICs