diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-07 23:35:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-07 23:35:40 -0400 |
| commit | 0d6c4a2e4641bbc556dd74d3aa158c413a972492 (patch) | |
| tree | da944af17682659bb433dc2282dcb48380c14cd1 /arch/hexagon/kernel/vdso.c | |
| parent | 6e06c0e2347ec79d0bd5702b2438fe883f784545 (diff) | |
| parent | 1c430a727fa512500a422ffe4712166c550ea06a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/e1000e/param.c
drivers/net/wireless/iwlwifi/iwl-agn-rx.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
drivers/net/wireless/iwlwifi/iwl-trans.h
Resolved the iwlwifi conflict with mainline using 3-way diff posted
by John Linville and Stephen Rothwell. In 'net' we added a bug
fix to make iwlwifi report a more accurate skb->truesize but this
conflicted with RX path changes that happened meanwhile in net-next.
In e1000e a conflict arose in the validation code for settings of
adapter->itr. 'net-next' had more sophisticated logic so that
logic was used.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/hexagon/kernel/vdso.c')
| -rw-r--r-- | arch/hexagon/kernel/vdso.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/hexagon/kernel/vdso.c b/arch/hexagon/kernel/vdso.c index f212a453b527..5d39f42f7085 100644 --- a/arch/hexagon/kernel/vdso.c +++ b/arch/hexagon/kernel/vdso.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/err.h> | 21 | #include <linux/err.h> |
| 22 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 23 | #include <linux/vmalloc.h> | 23 | #include <linux/vmalloc.h> |
| 24 | #include <linux/binfmts.h> | ||
| 24 | 25 | ||
| 25 | #include <asm/vdso.h> | 26 | #include <asm/vdso.h> |
| 26 | 27 | ||