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
..
alpha
arm	ARM: arm-soc Marvell Orion device-tree updates	2012-08-02 11:50:24 -07:00
avr32
blackfin
c6x
cris
frv
h8300
hexagon
ia64	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
m32r
m68k
microblaze
mips	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-08-01 16:47:15 -07:00
mn10300
openrisc
parisc
powerpc
s390
score
sh	sh: explicitly include sh_dma.h in setup-sh7722.c	2012-08-02 15:37:26 +09:00
sparc
tile
um
unicore32
x86	Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc	2012-08-02 11:52:39 -07:00
xtensa
.gitignore
Kconfig