diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 07:30:39 +0400 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 07:30:39 +0400 |
| commit | 11489736177c5930514482b4db7af862d945335d (patch) | |
| tree | 8590ec4ba037b79c94982e15922fe50a1f0193a3 /drivers/lguest | |
| parent | 3f0d0c9b47e09d47fcb755fed786a1ee88e110b5 (diff) | |
| parent | 6c2580c501c660fdfb506061e016d84570fceba1 (diff) | |
| download | linux-11489736177c5930514482b4db7af862d945335d.tar.xz | |
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>
Diffstat (limited to 'drivers/lguest')
0 files changed, 0 insertions, 0 deletions