tree 09c887299a82307f6ec5c2e334b9d55a44bd79cb
parent 952363c90c93e967c8e1819131b68cbb6f9c962f
parent a8fe9ea200ea21421ea750423d1d4d4f7ce037cf
author Linus Torvalds <torvalds@linux-foundation.org> 1262289455 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1262289455 -0800

Merge branch 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/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