summaryrefslogtreecommitdiff
path: root/staging
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-07-11 11:43:50 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-07-11 11:43:50 +0200
commit149f81a586944cf40d3003c7b9d07eb7a3e33f54 (patch)
tree3a1a6ee165ac688aef1b3f5f8b67b9877e229b89 /staging
parent7f841018c294bb2c0cf33c44aaf1951ef31549d1 (diff)
oui: update oui file from oui-update.py
This brings in a fresh version of the oui file via oui-update.py. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'staging')
0 files changed, 0 insertions, 0 deletions
/perf/arch/xtensa?id=2ad5d52d42810bed95100a3d912679d8864421ec'>2ad5d52d42810bed95100a3d912679d8864421ec (diff)
Merge branch 'parisc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull two parisc fixes from Helge Deller: "One fix to avoid usage of BITS_PER_LONG in user-space exported swab.h header which breaks compiling qemu, and one trivial fix for printk continuation in the parisc parport driver" * 'parisc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Don't use BITS_PER_LONG in userspace-exported swab.h header parisc, parport_gsc: Fixes for printk continuation lines
Diffstat (limited to 'tools/perf/arch/xtensa')