Merge commit 'v2.6.37-rc7' into devicetree/next
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 23 Dec 2010 07:41:14 +0000 (00:41 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 23 Dec 2010 07:41:14 +0000 (00:41 -0700)
commitcfb13c5db08c90311a5defdde9a0328ee788cca5
tree842cb60d1d19b99e550fdbc653723e4b13e51ee5
parent4b6ba8aacbb3185703b797286547d0f8f3859b02
parent90a8a73c06cc32b609a880d48449d7083327e11a
Merge commit 'v2.6.37-rc7' into devicetree/next
drivers/net/gianfar.c
drivers/net/ucc_geth.c