leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fbf1c247da
linux/arch/ia64
History
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
..
configs Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux 2011-11-02 16:52:17 -07:00
dig Disintegrate asm/system.h for IA64 2012-03-28 18:30:02 +01:00
hp tty: move the termios object into the tty 2012-07-16 13:00:41 -07:00
include/asm Miscellaneous ia64 build fixes 2012-07-30 13:22:19 -07:00
kernel Merge branch 'akpm' (Andrew's patch-bomb) 2012-07-31 19:25:39 -07:00
kvm Miscellaneous ia64 build fixes 2012-07-30 13:22:19 -07:00
lib Fix common misspellings 2011-03-31 11:26:23 -03:00
mm [IA64] Port OOM changes to ia64_do_page_fault 2012-06-14 13:11:37 -07:00
oprofile Disintegrate asm/system.h for IA64 2012-03-28 18:30:02 +01:00
pci Miscellaneous ia64 build fixes 2012-07-30 13:22:19 -07:00
scripts scripts: change scripts to use system python instead of env 2010-02-02 14:33:56 +01:00
sn Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2012-04-04 17:13:43 -07:00
uv ia64: change to new flag variables 2011-03-17 14:02:56 +01:00
xen Disintegrate asm/system.h for IA64 2012-03-28 18:30:02 +01:00
install.sh kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00
Kconfig [IA64] Mark PARAVIRT and KVM as broken 2012-07-25 11:45:31 -07:00
Kconfig.debug
Makefile Merge commit 'v2.6.35' into kbuild/kbuild 2010-08-04 13:59:13 +02:00
module.lds