Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 24 Dec 2005 20:32:55 +0000 (12:32 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 24 Dec 2005 20:32:55 +0000 (12:32 -0800)
commit10bb10dcb685cbe078e611f2dca3bd3e42fba0a8
tree79303391de7ed61a5c55b3599e386ee062e758ea
parent3bf395994da5c238c37e281b50a5dd5f2532dc0c
parente445ee65cbefaa19131c972ae7fe221c95cf4cc4
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6