From: Rusty Russell <rusty@rustcorp.com.au>
Date: Fri, 9 Aug 2013 03:30:39 +0000 (+0930)
Subject: Merge branch 'master' into virtio-next
X-Git-Tag: v3.12-rc1~85^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11489736177c5930514482b4db7af862d945335d;p=pandora-kernel.git

Merge branch 'master' into virtio-next

The next commit gets conflicts because it relies on patches which were
cc:stable and thus had to be merged into Linus' tree before the coming
merge window.  So pull in master now.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

11489736177c5930514482b4db7af862d945335d
Reading git-diff-tree failed