]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Sep 2009 17:08:23 +0000 (10:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Sep 2009 17:08:23 +0000 (10:08 -0700)
commit052a0cf6f85a136dc0654ec3c2d25ddd4495c65d
treeaa2d34bd03947776f2da2481e101c0baea063c38
parent9e6ec39becb02bda776eebf12c0677910d54b848
parent87ba00515657eede6077fa195ca6592b98cc31e3
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.