| commit | c32e7d669ef827f97d1aae8f6b34542665defbf6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 29 23:43:32 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 29 23:43:32 2011 -0700 |
| tree | 369b180339369fa90515d89eb10d7385aa4d4f76 | |
| parent | dbfe89877741726c30efb41f0132e247a78c3681 [diff] | |
| parent | 0642d2edc858a1f08716bb32e1ab890db8dac246 [diff] |
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/balloon: Fix compile errors - missing header files. xen/grant: Fix compile warning. xen/pciback: remove duplicated #include