Merge commit 'v2.6.37-rc7' into devicetree/next

author Grant Likely <grant.likely@secretlab.ca>

Thu, 23 Dec 2010 07:41:14 +0000 (00:41 -0700)

committer Grant Likely <grant.likely@secretlab.ca>

Thu, 23 Dec 2010 07:41:14 +0000 (00:41 -0700)
author Grant Likely <grant.likely@secretlab.ca>
Thu, 23 Dec 2010 07:41:14 +0000 (00:41 -0700)
committer Grant Likely <grant.likely@secretlab.ca>
Thu, 23 Dec 2010 07:41:14 +0000 (00:41 -0700)
diff --cc drivers/net/gianfar.c
Simple merge
diff --cc drivers/net/ucc_geth.c
Simple merge
author	Grant Likely <grant.likely@secretlab.ca>
	Thu, 23 Dec 2010 07:41:14 +0000 (00:41 -0700)
committer	Grant Likely <grant.likely@secretlab.ca>
	Thu, 23 Dec 2010 07:41:14 +0000 (00:41 -0700)
		1	2
drivers/net/gianfar.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/ucc_geth.c	patch \|	diff1 \|	diff2 \|	blob \| history