diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2010-05-11 17:40:57 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2010-05-11 17:40:57 +0200 |
| commit | 795e74f7a69f9c08afa4fa7c86cc4f18a62bd630 (patch) | |
| tree | 8448ece35101d8db945c49df50d0d5889687de9f /fs/gfs2/glock.c | |
| parent | a52357259680fe5368c2fabf5949209e231f2aa2 (diff) | |
| parent | 12c7389abe5786349d3ea6da1961cf78d0c1c7cd (diff) | |
| download | op-kernel-dev-795e74f7a69f9c08afa4fa7c86cc4f18a62bd630.zip op-kernel-dev-795e74f7a69f9c08afa4fa7c86cc4f18a62bd630.tar.gz | |
Merge branch 'iommu/largepages' into amd-iommu/2.6.35
Conflicts:
arch/x86/kernel/amd_iommu.c
Diffstat (limited to 'fs/gfs2/glock.c')
0 files changed, 0 insertions, 0 deletions
