tree 3946e0e444311245db5248bac6658e9b8082f269
parent cbeb2864b162f4298111196c8ce8ce492577cdee
parent d9d8e0418ffd3d189345c435861e254c17ae06e5
author Linus Torvalds <torvalds@linux-foundation.org> 1252348824 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1252348824 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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