Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux into devicet...
authorGrant Likely <grant.likely@secretlab.ca>
Mon, 27 Feb 2012 21:04:40 +0000 (14:04 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 27 Feb 2012 21:04:40 +0000 (14:04 -0700)

Trivial merge