summaryrefslogtreecommitdiff
path: root/patricia.h
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2013-06-14 15:26:35 +0200
committerTobias Klauser <tklauser@distanz.ch>2013-06-14 15:26:35 +0200
commit9d1ee4f333586967b75760226e781b1ebd181786 (patch)
tree78cf2c85e61043c46a27fc77a3dcef437cc0ef2c /patricia.h
parent57cd42f4138be67d2b6305fd54e40f1c6e3f9910 (diff)
conf: oui: run oui-update.py script to update OUI config file
Update OUI entries before release. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'patricia.h')
0 files changed, 0 insertions, 0 deletions
l-dfi-fs700-m60.dts parent62e13097c46c69dbd7544ab2cd585ccf48f360a4 (diff)parent6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts')