Merge branch 'fixes-togreg' into togreg
authorJonathan Cameron <jic23@kernel.org>
Sat, 30 Jun 2012 09:14:29 +0000 (10:14 +0100)
committerJonathan Cameron <jic23@kernel.org>
Sat, 30 Jun 2012 09:14:29 +0000 (10:14 +0100)

Trivial merge