From: Sage Weil <sage@inktank.com>
Date: Thu, 15 Aug 2013 18:11:45 +0000 (-0700)
Subject: Merge remote-tracking branch 'linus/master' into testing
X-Git-Tag: v3.12-rc1~90^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee3e542fec6e69bc9fb668698889a37d93950ddf;p=pandora-kernel.git

Merge remote-tracking branch 'linus/master' into testing
---

ee3e542fec6e69bc9fb668698889a37d93950ddf
Reading git-diff-tree failed