Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 23 Nov 2005 00:51:33 +0000 (16:51 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 23 Nov 2005 00:51:33 +0000 (16:51 -0800)
commit4b4a27dff4e2d4cc2eac1cde31aede834a966a48
tree72c387c47d5b6d658f089b16718d9113a278132a
parente6d184e33109010412ad1d59719af74755a935f4
parenta9b1ef8ec7df544b236b19fb6cc42ed2591b65cd
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6