git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fec38d1 f5412be)
Merge 2.6.38-rc6 into tty-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 24 Feb 2011 19:36:31 +0000 (11:36 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 24 Feb 2011 19:36:31 +0000 (11:36 -0800)
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>

Trivial merge
Pandora Kernel Repository