tree aa2d34bd03947776f2da2481e101c0baea063c38
parent 9e6ec39becb02bda776eebf12c0677910d54b848
parent 87ba00515657eede6077fa195ca6592b98cc31e3
author Linus Torvalds <torvalds@linux-foundation.org> 1253984903 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253984903 -0700

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.