diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-29 00:37:00 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-29 00:37:00 (GMT) |
| commit | b26d344c6b87058ae3e8f919a18580abfc4204eb (patch) | |
| tree | ff7026df8e8715e3c63d0ff4ff697a9fac6323fb /mm/pagewalk.c | |
| parent | 82aee5d7c01fd1a398e938e496e6cb8841775f91 (diff) | |
| parent | 76fbc247b9aebc30f6d2c8ec1f69edcb68eaa328 (diff) | |
| download | linux-b26d344c6b87058ae3e8f919a18580abfc4204eb.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/caif/caif_hsi.c
drivers/net/usb/qmi_wwan.c
The qmi_wwan merge was trivial.
The caif_hsi.c, on the other hand, was not. It's a conflict between
1c385f1fdf6f9c66d982802cd74349c040980b50 ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19cd0a30be93794aa4773c779c3eb1f3 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.
I did my best with that one and will ask Sjur to check it out.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'mm/pagewalk.c')
| -rw-r--r-- | mm/pagewalk.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/pagewalk.c b/mm/pagewalk.c index aa9701e..6c118d0 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -162,7 +162,6 @@ static int walk_hugetlb_range(struct vm_area_struct *vma, /** * walk_page_range - walk a memory map's page tables with a callback - * @mm: memory map to walk * @addr: starting address * @end: ending address * @walk: set of callbacks to invoke for each level of the tree |