linux/arch/um
Linus Torvalds a44f99c7ef Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
  video: change to new flag variable
  scsi: change to new flag variable
  rtc: change to new flag variable
  rapidio: change to new flag variable
  pps: change to new flag variable
  net: change to new flag variable
  misc: change to new flag variable
  message: change to new flag variable
  memstick: change to new flag variable
  isdn: change to new flag variable
  ieee802154: change to new flag variable
  ide: change to new flag variable
  hwmon: change to new flag variable
  dma: change to new flag variable
  char: change to new flag variable
  fs: change to new flag variable
  xtensa: change to new flag variable
  um: change to new flag variables
  s390: change to new flag variable
  mips: change to new flag variable
  ...

Fix up trivial conflict in drivers/hwmon/Makefile
2011-03-20 18:14:55 -07:00
..
drivers Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-03-15 18:28:30 -07:00
include percpu: align percpu readmostly subsection to cacheline 2011-01-25 14:26:50 +01:00
kernel um: Use proper accessors in show_interrupts() 2011-02-14 19:37:40 +01:00
os-Linux um: fix global timer issue when using CONFIG_NO_HZ 2010-10-26 16:52:03 -07:00
scripts
sys-i386 ptrace: change signature of arch_ptrace() 2010-10-27 18:03:10 -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 ptrace: cleanup arch_ptrace() on um 2010-10-27 18:03:12 -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
Kconfig.common um: Select GENERIC_HARDIRQS_NO_DEPRECATED 2011-02-14 19:37:40 +01:00
Kconfig.debug
Kconfig.net
Kconfig.rest uml: kill a kconfig warning 2009-04-21 13:41:50 -07:00
Kconfig.um genirq: Remove __do_IRQ 2011-01-21 11:55:31 +01:00
Kconfig.x86 x86: Remove dead config option X86_CPU 2011-03-09 10:39:36 +01:00
Makefile kbuild: move asm-offsets.h to include/generated 2009-12-12 13:08:14 +01:00
Makefile-i386
Makefile-ia64
Makefile-os-Linux
Makefile-ppc
Makefile-skas
Makefile-x86_64