From: Jiri Kosina Date: Wed, 7 Sep 2011 11:53:17 +0000 (+0200) Subject: Merge branches 'upstream-fixes' and 'magicmouse' into for-linus X-Git-Tag: v3.1-rc6~20^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=882aba01052476cbe3cd7339a3e6784b2437f18d;p=ceph-client.git Merge branches 'upstream-fixes' and 'magicmouse' into for-linus --- 882aba01052476cbe3cd7339a3e6784b2437f18d