Public Git Hosting - linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: fec38d1 f5412be)

commit	f227e08b71b9c273eaa29a57370a3a5b833aa382
author	Greg Kroah-Hartman <gregkh@suse.de>
	Thu, 24 Feb 2011 19:36:31 +0000 (24 11:36 -0800)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Thu, 24 Feb 2011 19:36:31 +0000 (24 11:36 -0800)
tree	9f1483776a2bde3bb1a6bd744e69acf19f6f3428	tree \| snapshot (tar.gz zip)
parent	fec38d1752c01ad72789bac9f1a128f7e933735d	commit \| diff
parent	f5412be599602124d2bdd49947b231dd77c0bf99	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 2.6 ibm-acpi/thinkpad-acpi driver git tree