Merge remote-tracking branch 'robherring/for-next' into devicetree/next
authorGrant Likely <grant.likely@secretlab.ca>
Tue, 4 Dec 2012 16:15:52 +0000 (16:15 +0000)
committerGrant Likely <grant.likely@secretlab.ca>
Tue, 4 Dec 2012 16:15:52 +0000 (16:15 +0000)

Trivial merge