Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 16 Nov 2005 16:25:28 +0000 (08:25 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 16 Nov 2005 16:25:28 +0000 (08:25 -0800)
commit0db169f9703115bab09eda5d89a8f6937a7bf98e
treec7fb83d10394e33dffe4ae13d9878e8e500bb60a
parentd58a75ef75ad98f2d20ee6dccfc71f881aabffb0
parent6e87abd0b8cbb23ed9ffe5cc9f790fb5cac45eae
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6