tree 4dfb959942469ec36156bc222526f82f2d42fe14
parent 413318444fd5351f9858b9deb4e8ecaf8898ee05
parent 00540e5d54be972a94a3b2ce6da8621bebe731a2
author Linus Torvalds <torvalds@linux-foundation.org> 1245615233 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1245615233 -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:
  lockdep: Select frame pointers on x86
  dma-debug: be more careful when building reference entries
  dma-debug: check for sg_call_ents in best-fit algorithm too