tree eacb68580f8fcc99e07b733f2b0871c62466232b
parent 44afa9a4b8c5773f47e6494da12ca086c9ffea34
parent ec9c96ef3cc0124cb94375b17faaa8cff5dfdf97
author Linus Torvalds <torvalds@linux-foundation.org> 1251224664 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1251224664 -0700

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  dma-debug: Fix check_unmap null pointer dereference