Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux into devicet...
Grant Likely [Mon, 27 Feb 2012 21:04:40 +0000 (14:04 -0700)]

Trivial merge