Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
commit2fe9f798ba3cf7c939e638b78f46975e79039978
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 21 Sep 2005 14:53:38 +0000 (21 07:53 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 21 Sep 2005 14:53:38 +0000 (21 07:53 -0700)
treef65153c806f68bd6e965d65d7c7e4104b27fff90
parent76abf3e71c5a4d315ec95e23e5aedd15fbfcd6df
parenta131430c200f6bda313bf5d0a8e238c41afdfe0a
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6