summaryrefslogtreecommitdiff
path: root/scripts/pnmtologo.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-08-25 16:12:45 -0700
committerDavid S. Miller <davem@davemloft.net>2015-08-25 16:12:45 -0700
commite732cdd416cb85fdba6919af2e271c64c08bb26d (patch)
tree43c97c9cc26bf944d9b5e4a9b29080d26d373d59 /scripts/pnmtologo.c
parent83bc805bff89854e4c81c67633a52ce1015b1502 (diff)
parent06b23f7fbbf26a025fd68395c7586949db586b47 (diff)
Merge tag 'linux-can-fixes-for-4.2-20150825' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says: ==================== this is the updated pull request of one patch by me for the peak_usb driver. It fixes the driver, so that non FD adapters don't provide CAN FD bittimings. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'scripts/pnmtologo.c')
0 files changed, 0 insertions, 0 deletions