tree 9f1483776a2bde3bb1a6bd744e69acf19f6f3428
parent fec38d1752c01ad72789bac9f1a128f7e933735d
parent f5412be599602124d2bdd49947b231dd77c0bf99
author Greg Kroah-Hartman <gregkh@suse.de> 1298576191 -0800
committer Greg Kroah-Hartman <gregkh@suse.de> 1298576191 -0800

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>