Merge branch 'robherring/for-next' from git://sources.calxeda.com/kernel/linux.git
authorGrant Likely <grant.likely@secretlab.ca>
Fri, 8 Feb 2013 09:23:33 +0000 (09:23 +0000)
committerGrant Likely <grant.likely@secretlab.ca>
Fri, 8 Feb 2013 09:23:33 +0000 (09:23 +0000)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

Trivial merge