#!/bin/bash # -*- coding: utf-8 -*- # # nacl_path.sh -- NaCl path export script # # Copyright (C) 2009-2011 Emmanuel Roullit # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. nacl_include_path="$1" nacl_lib_path="$2" if test -z $nacl_include_path || test -z $nacl_lib_path; then echo "Please input the path where NaCl is like the following:" echo "./$0.sh " exit 1 fi echo "export NACL_INC_DIR=$nacl_include_path" >> ~/.bashrc echo "export NACL_LIB_DIR=$nacl_lib_path" >> ~/.bashrc der'> cgit logo index : net-next.git
net-next plumbingsTobias Klauser
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch)
treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /net/bluetooth/hci_request.h
parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)
parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/hci_request.h')