diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-27 19:59:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-27 19:59:56 -0500 |
| commit | 95f873f2fff96c592c5d863e2a39825bd8bf0500 (patch) | |
| tree | 0d2dd664964ba2c701aefea5b4d1e85b481045e1 /drivers/ata/pata_ns87415.c | |
| parent | 8ea65f4a2dfaaf494ef42a16cbf2fea39b07450f (diff) | |
| parent | 59343cd7c4809cf7598789e1cd14563780ae4239 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
arch/arm/boot/dts/imx6sx-sdb.dts
net/sched/cls_bpf.c
Two simple sets of overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ata/pata_ns87415.c')
0 files changed, 0 insertions, 0 deletions