]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Mar 2008 00:04:58 +0000 (17:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Mar 2008 00:04:58 +0000 (17:04 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: revert: reserve dma32 early for gart


Trivial merge