diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-26 22:37:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-26 22:37:08 +0200 |
| commit | b05930f5d1c7d5873cb050261d21789a99de9d48 (patch) | |
| tree | 2d374846712b0bdacc5dd0a36b3c2f754886e560 /fs/nilfs2/direct.h | |
| parent | Merge branch 'cadence' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-b05930f5d1c7d5873cb050261d21789a99de9d48.tar.xz linux-b05930f5d1c7d5873cb050261d21789a99de9d48.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
include/linux/inetdevice.h
The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.
The iwlwifi conflict is a context overlap.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/nilfs2/direct.h')
0 files changed, 0 insertions, 0 deletions