| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 | [log] [tgz] |
|---|---|---|
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | Wed Dec 09 17:14:38 2009 +1100 |
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | Wed Dec 09 17:14:38 2009 +1100 |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 [diff] | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c [diff] |
Merge commit 'origin/master' into next Conflicts: include/linux/kvm.h