| commit | 11489736177c5930514482b4db7af862d945335d | [log] [tgz] |
|---|---|---|
| author | Rusty Russell <rusty@rustcorp.com.au> | Fri Aug 09 13:00:39 2013 +0930 |
| committer | Rusty Russell <rusty@rustcorp.com.au> | Fri Aug 09 13:00:39 2013 +0930 |
| tree | 8590ec4ba037b79c94982e15922fe50a1f0193a3 | |
| parent | 3f0d0c9b47e09d47fcb755fed786a1ee88e110b5 [diff] | |
| parent | 6c2580c501c660fdfb506061e016d84570fceba1 [diff] |
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>