kevin/linux
1
Fork 0
Code
3cfef95246
linux/arch/um
History
David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net 
Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c
2011-09-22 03:23:13 -04:00
..
drivers Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
include um: clean arch_ptrace() up a bit 2011-09-14 18:09:37 -07:00
kernel um: clean arch_ptrace() up a bit 2011-09-14 18:09:37 -07:00
os-Linux um: Save FPU registers between task switches 2011-09-14 18:09:37 -07:00
scripts
sys-i386 um: clean arch_ptrace() up a bit 2011-09-14 18:09:37 -07:00
sys-ia64 uml: remove useless comments 2009-04-01 08:59:17 -07:00
sys-ppc um: change to new flag variables 2011-03-17 14:02:57 +01:00
sys-x86_64 um: clean arch_ptrace() up a bit 2011-09-14 18:09:37 -07:00
.gitignore um: tell git to ignore generated files 2010-03-06 11:26:28 -08:00
defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
Kconfig.char sound: make OSS sound core optional 2008-08-29 10:06:21 +02:00
Kconfig.common genirq: Remove the now obsolete config options and select statements 2011-03-30 14:13:23 +02:00
Kconfig.debug lib: consolidate DEBUG_STACK_USAGE option 2011-05-25 08:39:54 -07:00
Kconfig.net Fix common misspellings 2011-03-31 11:26:23 -03:00
Kconfig.rest uml: kill a kconfig warning 2009-04-21 13:41:50 -07:00
Kconfig.um uml: fix hppfs build 2011-04-28 11:28:21 -07:00
Kconfig.x86 um: disable CMPXCHG_DOUBLE as it breaks UML build 2011-09-14 18:09:37 -07:00
Makefile um: fix strrchr() problems 2011-09-14 18:09:37 -07:00
Makefile-i386 [UML] fix gcc ICEs and unresolved externs 2008-07-07 10:53:10 -07:00
Makefile-ia64
Makefile-os-Linux x86, um: get rid of arch/um/os symlink 2008-10-22 22:55:22 -07:00
Makefile-ppc
Makefile-skas
Makefile-x86_64 [UML] fix gcc ICEs and unresolved externs 2008-07-07 10:53:10 -07:00