kernel-fxtec-pro1x/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
os-Linux
shared/sysdep
vdso
bug.c
bugs_32.c
bugs_64.c
checksum_32.S
delay.c
elfcore.c
fault.c
Kconfig
ksyms.c
ldt.c
Makefile
mem_32.c
mem_64.c
ptrace_32.c
ptrace_64.c
ptrace_user.c
setjmp_32.S
setjmp_64.S
signal.c
stub_32.S
stub_64.S
stub_segv.c
sys_call_table_32.S
sys_call_table_64.c
syscalls_32.c
syscalls_64.c
sysrq_32.c
sysrq_64.c
tls_32.c
tls_64.c
user-offsets.c