Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
commit6e5a32754c67f0d156c2f196d604b2e9129a1fd5
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 03:10:18 +0000 (27 20:10 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 03:10:18 +0000 (27 20:10 -0700)
tree2dc77bbae2b2896c6435dc25c013d5d053fba591
parentb6d00f0de9e932e2884b3b7af8e43c0a61a271ee
parent63b614522cba5a015923c0e8f284be6e01c13f1a
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6