git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 82e0134 d986088)

author	Greg Kroah-Hartman <gregkh@suse.de>
	Thu, 24 Feb 2011 19:36:31 +0000 (11:36 -0800)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Thu, 24 Feb 2011 19:36:31 +0000 (11:36 -0800)
commit	5df779f67535c9f5f0f9d423cfade1c5929bb1b4
tree	9f1483776a2bde3bb1a6bd744e69acf19f6f3428	tree \| snapshot
parent	82e0134d1bf3041dbc123873fd81498d591a0f08	commit \| diff
parent	d986088e8584b3265524a1b77c0511ceccafe2af	commit \| diff

Merge 2.6.38-rc6 into tty-next

This was to resolve a merge issue with drivers/char/Makefile and
drivers/tty/serial/68328serial.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/char/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/hso.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/hvc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/tty/n_gsm.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/68328serial.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/68360serial.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/class/cdc-acm.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/ftdi_sio.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/io_edgeport.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/ti_usb_3410_5052.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.