Greg Kroah-Hartman c87985a3ce Merge tty-next into 3.6-rc1 ... This handles the merge issue in: arch/um/drivers/line.c arch/um/drivers/line.h And resolves the duplicate patches that were in both trees do to the tty-next branch not getting merged into 3.6-rc1. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-08-06 09:48:31 -07:00
..
card	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
core	mmc: core: reset signal voltage on power up	2012-07-22 15:25:53 -04:00
host	Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm	2012-08-01 16:41:07 -07:00
Kconfig
Makefile