| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 26 Sep 2009 17:08:23 +0000 (10:08 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 26 Sep 2009 17:08:23 +0000 (10:08 -0700) | ||
| commit | 052a0cf6f85a136dc0654ec3c2d25ddd4495c65d | |
| tree | aa2d34bd03947776f2da2481e101c0baea063c38 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 9e6ec39becb02bda776eebf12c0677910d54b848 | commit | diff |
| parent | 87ba00515657eede6077fa195ca6592b98cc31e3 | commit | diff |
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.
* 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.