Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Sep 2009 18:40:24 +0000 (11:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Sep 2009 18:40:24 +0000 (11:40 -0700)
commit4886b5b485ec78fe4a16fedaccfab39bdf55410f
tree3946e0e444311245db5248bac6658e9b8082f269
parentcbeb2864b162f4298111196c8ce8ce492577cdee
parentd9d8e0418ffd3d189345c435861e254c17ae06e5
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  gianfar: Fix build.