Merge branch 'for-next' of git://sources.calxeda.com/kernel/linux into HEAD
authorGrant Likely <grant.likely@secretlab.ca>
Tue, 7 May 2013 11:03:42 +0000 (12:03 +0100)
committerGrant Likely <grant.likely@secretlab.ca>
Tue, 7 May 2013 11:03:42 +0000 (12:03 +0100)

Trivial merge