]> err.no Git - linux-2.6/commit
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Aug 2008 17:28:17 +0000 (10:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Aug 2008 17:28:17 +0000 (10:28 -0700)
commit57b1494d2ba544c62673234da6115c21fac27ffc
tree34f91f3187805fa034f8e63966d471ba2498d148
parent9fe3b64be3dc8313e9fa87255f169c608d074cbd
parent8978b74253280d59e97cf49a3ec2c0cbccd5b801
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  generic, x86: fix add iommu_num_pages helper function
  x86: remove stray <6> in BogoMIPS printk
  x86: move dma32_reserve_bootmem() after reserve_crashkernel()