From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Sep 2009 17:08:23 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=052a0cf6f85a136dc0654ec3c2d25ddd4495c65d;p=linux-edison.git

Merge git://git./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.
---

052a0cf6f85a136dc0654ec3c2d25ddd4495c65d