linux-stable-rt/arch/microblaze/kernel
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
..
cpu
Makefile
asm-offsets.c
dma.c
early_printk.c
entry-nommu.S
entry.S
exceptions.c
ftrace.c
head.S
heartbeat.c
hw_exception_handler.S
init_task.c
intc.c
irq.c
kgdb.c
mcount.S
microblaze_ksyms.c
misc.S
module.c
process.c
prom.c
prom_parse.c
ptrace.c
reset.c
selfmod.c
setup.c
signal.c
stacktrace.c
sys_microblaze.c
syscall_table.S
timer.c
traps.c
unwind.c
vmlinux.lds.S