aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k/math-emu/multi_arith.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-26 10:08:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-26 10:08:23 -0700
commit052a0cf6f85a136dc0654ec3c2d25ddd4495c65d (patch)
treeaa2d34bd03947776f2da2481e101c0baea063c38 /arch/m68k/math-emu/multi_arith.h
parent9e6ec39becb02bda776eebf12c0677910d54b848 (diff)
parent87ba00515657eede6077fa195ca6592b98cc31e3 (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.
Diffstat (limited to 'arch/m68k/math-emu/multi_arith.h')
0 files changed, 0 insertions, 0 deletions