diff options
| author | David S. Miller <davem@davemloft.net> | 2014-04-24 13:19:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-24 13:19:00 -0400 |
| commit | 4366004d77278a90c18f92f7cb9ec0c264da563d (patch) | |
| tree | 4fb046b6b06cc681f791a8ddf7507b5f8eb99be8 /Documentation/ptp | |
| parent | e9f0fb88493570200b8dc1cc02d3e676412d25bc (diff) | |
| parent | a450a685791d12c0a477b75d630d6ae66acab9a7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/igb/e1000_mac.c
net/core/filter.c
Both conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/ptp')
0 files changed, 0 insertions, 0 deletions