From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 12 Sep 2011 14:59:37 +0000 (+0000)
Subject: Merge branch 'sirf/fixes' into fixes
X-Git-Tag: v3.1-rc6~2^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d035953e59ca8bb7ffc1023efba72438524457bb;p=linux.git

Merge branch 'sirf/fixes' into fixes
---

d035953e59ca8bb7ffc1023efba72438524457bb