Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 18 Jan 2006 01:19:53 +0000 (17:19 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 18 Jan 2006 01:19:53 +0000 (17:19 -0800)
commit8f28afac3494f573ac774030a1f840b7d6237da2
tree3a405d14b578d4d3b7bf1884667ad43022cc65f2
parentc6b3feaf5774508ab5a955a81e45ffefa3b12eaa
parent4f3f2f6f3e7ce68c533e7786114f05181772ff6f
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6