dect
/
linux-2.6
Archived
13
0
Fork 0
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/arch/x86/um
Linus Torvalds 02ebbbd481 Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scsi: drop unused Kconfig symbol
  pci: drop unused Kconfig symbol
  stmmac: drop unused Kconfig symbol
  x86: drop unused Kconfig symbol
  powerpc: drop unused Kconfig symbols
  powerpc: 40x: drop unused Kconfig symbol
  mips: drop unused Kconfig symbols
  openrisc: drop unused Kconfig symbols
  arm: at91: drop unused Kconfig symbol
  samples: drop unused Kconfig symbol
  m32r: drop unused Kconfig symbol
  score: drop unused Kconfig symbols
  sh: drop unused Kconfig symbol
  um: drop unused Kconfig symbol
  sparc: drop unused Kconfig symbol
  alpha: drop unused Kconfig symbol

Fix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig
as per Michal: the STMMAC_DUAL_MAC config variable is still unused and
should be deleted.
2011-11-06 18:54:53 -08:00
..
asm um: kill system-um.h 2011-11-02 14:15:34 +01:00
os-Linux um: we need sys/user.h only on i386 2011-11-02 14:15:38 +01:00
shared/sysdep um: unify ptrace_user.h 2011-11-02 14:15:27 +01:00
vdso um: Fix kmalloc argument order in um/vdso/vma.c 2011-11-02 14:15:42 +01:00
Kconfig Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2011-11-06 18:54:53 -08:00
Makefile um: merge delay_{32,64}.c 2011-11-02 14:15:37 +01:00
bug.c
bugs_32.c um: kill shared/task.h and HOST_TASK_REGS 2011-11-02 14:15:08 +01:00
bugs_64.c
checksum_32.S
delay.c um: merge delay_{32,64}.c 2011-11-02 14:15:37 +01:00
elfcore.c
fault.c
ksyms.c
ldt.c um: take ldt.h to arch/x86/um/asm/mm_context.h 2011-11-02 14:15:21 +01:00
mem_32.c
mem_64.c
ptrace_32.c um: merge HOST_... of registers common on i386 and amd64 2011-11-02 14:15:18 +01:00
ptrace_64.c um: unify ptrace_user.h 2011-11-02 14:15:27 +01:00
ptrace_user.c
setjmp_32.S
setjmp_64.S
signal.c um: merge signal_{32,64}.c 2011-11-02 14:15:20 +01:00
stub_32.S
stub_64.S
stub_segv.c
sys_call_table_32.S um: merge signal_{32,64}.c 2011-11-02 14:15:20 +01:00
sys_call_table_64.c um: sanitize paths in sys_call_table* includes 2011-11-02 14:15:18 +01:00
syscalls_32.c
syscalls_64.c
sysrq_32.c
sysrq_64.c um: merge signal_{32,64}.c 2011-11-02 14:15:20 +01:00
tls_32.c
tls_64.c
user-offsets.c um: unify ptrace_user.h 2011-11-02 14:15:27 +01:00