dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/drivers/net/can
History
Linus Torvalds 99dff58562 Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)
  serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
  tty/serial: Fix break handling for PORT_TEGRA
  tty/serial: Add explicit PORT_TEGRA type
  n_tracerouter and n_tracesink ldisc additions.
  Intel PTI implementaiton of MIPI 1149.7.
  Kernel documentation for the PTI feature.
  export kernel call get_task_comm().
  tty: Remove to support serial for S5P6442
  pch_phub: Support new device ML7223
  8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter
  ASoC: Update cx20442 for TTY API change
  pch_uart: Support new device ML7223 IOH
  parport: Use request_muxed_region for IT87 probe and lock
  tty/serial: add support for Xilinx PS UART
  n_gsm: Use print_hex_dump_bytes
  drivers/tty/moxa.c: Put correct tty value
  TTY: tty_io, annotate locking functions
  TTY: serial_core, remove superfluous set_task_state
  TTY: serial_core, remove invalid test
  Char: moxa, fix locking in moxa_write
  ...

Fix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and
drivers/tty/serial/Makefile.

I did the hci_ldisc thing as an evil merge, cleaning things up.
 		2011-05-23 12:23:20 -07:00
..
c_can Fix common misspellings 2011-03-31 11:26:23 -03:00
mscan drivercore: revert addition of of_match to struct device 2011-05-18 12:32:23 -06:00
sja1000 can: fix SJA1000 dlc for RTR packets 2011-05-05 11:02:22 -07:00
softing Merge branch 'master' into for-next 2011-04-26 10:22:59 +02:00
usb Fix common misspellings 2011-03-31 11:26:23 -03:00
Kconfig can: c_can: Added support for Bosch C_CAN controller 2011-02-13 22:51:44 -08:00
Makefile can: c_can: Added support for Bosch C_CAN controller 2011-02-13 22:51:44 -08:00
at91_can.c Fix common misspellings 2011-03-31 11:26:23 -03:00
bfin_can.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
dev.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
flexcan.c can: flexcan: fix use after free of priv 2010-10-26 10:48:58 -07:00
janz-ican3.c Fix common misspellings 2011-03-31 11:26:23 -03:00
mcp251x.c can: mcp251x: Allow pass IRQ flags through platform data. 2011-04-06 12:24:26 -07:00
pch_can.c treewide: fix a few typos in comments 2011-05-10 10:16:21 +02:00
slcan.c Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2011-05-23 12:23:20 -07:00
ti_hecc.c Fix common misspellings 2011-03-31 11:26:23 -03:00
vcan.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00