2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 14:43:58 +08:00
linux-next/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 Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 2011-03-20 18:14:55 -07:00
asm-offsets.c microblaze: Remove "cache" optimized copy_page function 2010-05-06 11:21:58 +02:00
dma.c microblaze: Add support for DMA_BIDIRECTIONAL 2011-03-09 08:09:57 +01:00
early_printk.c microblaze: Support early console on uart16550 2010-10-21 15:51:53 +10:00
entry-nommu.S microblaze: Do not use "la" pseudo instruction - use addik instead 2011-03-09 08:09:54 +01:00
entry.S microblaze: Do not copy reset vectors/manual reset vector setup 2011-03-15 10:59:00 +01:00
exceptions.c microblaze: Fix sparse warning - sw_exceptions 2011-03-09 08:09:58 +01:00
ftrace.c microblaze: Fix ftrace_update_ftrace_func panic 2010-04-07 07:27:25 +02:00
head.S microblaze: Do not use "la" pseudo instruction - use addik instead 2011-03-09 08:09:54 +01:00
heartbeat.c microblaze: Add support for little-endian Microblaze 2010-10-21 15:51:59 +10:00
hw_exception_handler.S microblaze: Do not use "la" pseudo instruction - use addik instead 2011-03-09 08:09:54 +01:00
init_task.c Use new __init_task_data macro in arch init_task.c files. 2009-09-21 06:27:08 +02:00
intc.c microblaze: Convert irq_chip to new functions 2011-03-09 08:09:59 +01:00
irq.c microblaze: Convert irq_chip to new functions 2011-03-09 08:09:59 +01:00
kgdb.c microblaze: KGDB little endian support 2010-10-21 15:51:58 +10:00
Makefile Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-05 15:57:35 -07:00
mcount.S microblaze: ftrace: Add dynamic function graph tracer 2009-12-14 08:44:54 +01:00
microblaze_ksyms.c microblaze: Add missing export symbols for lib functions 2011-03-09 08:09:59 +01:00
misc.S microblaze: Fix comment for TLB 2010-08-02 10:44:03 +02:00
module.c microblaze: Fix module loading on system with WB cache 2010-05-14 07:43:38 +02:00
process.c microblaze: Remove r0_ram pointer and PTO alignment 2011-03-09 08:09:54 +01:00
prom_parse.c of/pci: move of_irq_map_pci() into generic code 2011-02-04 11:46:50 -07:00
prom.c microblaze: Fix sparse warning - prom.c 2011-03-09 08:09:57 +01:00
ptrace.c microblaze: Fix sparse warnings - ptrace 2011-03-09 08:09:58 +01:00
reset.c of/gpio: stop using device_node data pointer to find gpio_chip 2010-07-05 16:14:30 -06:00
selfmod.c microblaze_v8: Selfmodified code 2009-03-27 14:25:15 +01:00
setup.c microblaze: Do not copy reset vectors/manual reset vector setup 2011-03-15 10:59:00 +01:00
signal.c microblaze: Fix sparse warnings - signal.c 2011-03-09 08:09:59 +01:00
stacktrace.c microblaze: Add stack unwinder 2010-08-04 10:22:35 +02:00
sys_microblaze.c microblaze: Fix missing microblaze specific syscalls declaration 2011-03-09 08:09:58 +01:00
syscall_table.S microblaze: wire up prlimit64 and fanotify* syscalls 2010-10-21 15:51:38 +10:00
timer.c microblaze: Fix sparse warning - timer.c 2011-03-09 08:09:57 +01:00
traps.c microblaze: Add stack unwinder 2010-08-04 10:22:35 +02:00
unwind.c microblaze: Fix sparse warning - unwind.c 2011-03-09 08:09:58 +01:00
vmlinux.lds.S microblaze: Remove r0_ram pointer and PTO alignment 2011-03-09 08:09:54 +01:00