Merge branch 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Dec 2009 19:57:35 +0000 (11:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Dec 2009 19:57:35 +0000 (11:57 -0800)
commit9de54606d3d55095e4426a81a79a41d8e5e5b6be
tree09c887299a82307f6ec5c2e334b9d55a44bd79cb
parent952363c90c93e967c8e1819131b68cbb6f9c962f
parenta8fe9ea200ea21421ea750423d1d4d4f7ce037cf
Merge branch 'x86-fixes-for-linus-2' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  dma-debug: Fix bug causing build warning