diff options
| author | Joerg Roedel <jroedel@suse.de> | 2014-05-30 20:22:10 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-05-30 20:22:10 +0200 |
| commit | c0981b863a31a1891aa2719957983f4297770f87 (patch) | |
| tree | b6d4a99bb893aea2d89579d328cf8980993b35a4 /fs/freevxfs/vxfs.h | |
| parent | 286f600bc890347f7ec7bd50d33210d53a9095a3 (diff) | |
| parent | 645d6c87229c91cb0d1e2ffcb42c576ec8058a35 (diff) | |
| parent | 9db4241e83f6d78321f5e95a1721c4158220021f (diff) | |
| parent | 3dbc26085383570935e475aa08b67d5cc05be390 (diff) | |
| parent | 365409db5d8811315297b8d03097d363683bfb5b (diff) | |
| parent | 720b0cef715ab97b21b33e7f3c328e2863411cab (diff) | |
| parent | d6a71bf79da03b835f8df5430eaee6fc46df1038 (diff) | |
| parent | afba256b14644e4ca5f9e84672e61b14cb71c40e (diff) | |
Merge branches 'iommu/fixes', 'arm/omap', 'arm/smmu', 'arm/shmobile', 'x86/amd', 'arm/exynos', 'arm/renesas', 'ppc/pamu' and 'arm/msm' into next