Merge commit 'v2.6.37-rc7' into devicetree/next
Grant Likely [Thu, 23 Dec 2010 07:41:14 +0000 (00:41 -0700)]
1  2 
drivers/net/gianfar.c
drivers/net/ucc_geth.c

Simple merge
Simple merge