linux_dsm_epyc7002/arch/sparc/include
Linus Torvalds 052a0cf6f8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: vio: Kill BUILD_BUG_ON() in vio_dring_avail().

Trivial conflict in arch/sparc/include/asm/vio.h due to David removing
the whole messy BUG_ON that was confused.
2009-09-26 10:08:23 -07:00
..
asm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 2009-09-26 10:08:23 -07:00