Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji into fixes
authorOlof Johansson <olof@lixom.net>
Fri, 11 Nov 2011 18:34:20 +0000 (10:34 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 11 Nov 2011 18:34:20 +0000 (10:34 -0800)

Trivial merge