tree d3ae691a55226e3671caa1f837e127693f6742e8
parent cf76dddb22c019f03ada6479210f894f19bd591b
parent 6afe40b4dace385d7ba2faf24b352f066f3b71bf
author Linus Torvalds <torvalds@linux-foundation.org> 1225212567 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1225212567 -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: fix irqs on/off ip tracing
  lockdep: minor fix for debug_show_all_locks()
  x86: restore the old swiotlb alloc_coherent behavior
  x86: use GFP_DMA for 24bit coherent_dma_mask
  swiotlb: remove panic for alloc_coherent failure
  xen: compilation fix of drivers/xen/events.c on IA64
  xen: portability clean up and some minor clean up for xencomm.c
  xen: don't reload cr3 on suspend
  kernel/resource: fix reserve_region_with_split() section mismatch
  printk: remove unused code from kernel/printk.c