| commit | bf550fc93d9855872a95e69e4002256110d89858 | [log] [tgz] |
|---|---|---|
| author | Alexander Graf <agraf@suse.de> | Thu Aug 29 00:41:59 2013 +0200 |
| committer | Alexander Graf <agraf@suse.de> | Thu Aug 29 00:41:59 2013 +0200 |
| tree | 10876bb4304bffe54c4160a132e7b8de6577ac4e | |
| parent | 7e48c101e0c53e6095c5f4f5e63d14df50aae8fc [diff] | |
| parent | cc2df20c7c4ce594c3e17e9cc260c330646012c8 [diff] |
Merge remote-tracking branch 'origin/next' into kvm-ppc-next Conflicts: mm/Kconfig CMA DMA split and ZSWAP introduction were conflicting, fix up manually.