Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/microblaze/include/asm
History
Linus Torvalds d10902812c Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (27 commits)
  x86: Clean up apic.c and apic.h
  x86: Remove superflous goal definition of tsc_sync
  x86: dt: Correct local apic documentation in device tree bindings
  x86: dt: Cleanup local apic setup
  x86: dt: Fix OLPC=y/INTEL_CE=n build
  rtc: cmos: Add OF bindings
  x86: ce4100: Use OF to setup devices
  x86: ioapic: Add OF bindings for IO_APIC
  x86: dtb: Add generic bus probe
  x86: dtb: Add support for PCI devices backed by dtb nodes
  x86: dtb: Add device tree support for HPET
  x86: dtb: Add early parsing of IO_APIC
  x86: dtb: Add irq domain abstraction
  x86: dtb: Add a device tree for CE4100
  x86: Add device tree support
  x86: e820: Remove conditional early mapping in parse_e820_ext
  x86: OLPC: Make OLPC=n build again
  x86: OLPC: Remove extra OLPC_OPENFIRMWARE_DT indirection
  x86: OLPC: Cleanup config maze completely
  x86: OLPC: Hide OLPC_OPENFIRMWARE config switch
  ...

Fix up conflicts in arch/x86/platform/ce4100/ce4100.c
2011-03-15 20:01:36 -07:00
..
asm-compat.h microblaze: Copy ppc asm-compat.h for clean handling of constants in asm and C 2009-09-22 10:10:06 +02:00
asm-offsets.h kbuild: move asm-offsets.h to include/generated 2009-12-12 13:08:14 +01:00
atomic.h
auxvec.h
bitops.h
bitsperlong.h
bug.h
bugs.h
byteorder.h microblaze: Add support for little-endian Microblaze 2010-10-21 15:51:59 +10:00
cache.h microblaze: Define correct L1_CACHE_SHIFT value 2010-05-06 11:21:59 +02:00
cacheflush.h microblaze: Fix copy_to_user_page macro 2010-08-04 10:22:31 +02:00
checksum.h microblaze: Add support for little-endian Microblaze 2010-10-21 15:51:59 +10:00
clinkage.h
cpuinfo.h microblaze: Support timer on AXI lite 2010-10-21 15:52:00 +10:00
cputable.h
cputime.h
current.h
delay.h
device.h arch/microblaze: Move dma_mask from of_device into pdev_archdata 2010-05-22 00:10:40 -06:00
div64.h
dma-mapping.h dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
dma.h microblaze: Add isa_dma_bridge_buggy to dma.h 2010-05-06 11:21:58 +02:00
elf.h microblaze: Add support for little-endian Microblaze 2010-10-21 15:51:59 +10:00
emergency-restart.h
entry.h percpu: remove per_cpu__ prefix. 2009-10-29 22:34:15 +09:00
errno.h
exceptions.h microblaze: Add KGDB support 2010-08-04 10:45:17 +02:00
fb.h
fcntl.h
flat.h
ftrace.h microblaze: ftrace: Add dynamic trace support 2009-12-14 08:44:01 +01:00
futex.h futex: Sanitize futex ops argument types 2011-03-11 12:23:31 +01:00
gpio.h microblaze: support gpio_to_irq() 2010-10-21 15:51:41 +10:00
hardirq.h
hw_irq.h
io.h microblaze: Define empty mmiowb 2010-10-21 15:51:39 +10:00
ioctl.h
ioctls.h
ipcbuf.h
irq.h of/irq: Move irq_of_parse_and_map() to common code 2010-06-28 12:41:33 -07:00
irq_regs.h
irqflags.h microblaze: Fix IRQ flag handling for MSR=0 2011-02-07 19:12:04 +01:00
Kbuild
kdebug.h
kgdb.h microblaze: Add KGDB support 2010-08-04 10:45:17 +02:00
kmap_types.h
linkage.h
local.h
local64.h arch: Implement local64_t 2010-06-09 11:12:36 +02:00
memblock.h memblock: Introduce default allocation limit and use it to replace explicit ones 2010-08-05 12:56:07 +10:00
mman.h
mmu.h
mmu_context.h
mmu_context_mm.h
module.h
msgbuf.h
mutex.h
namei.h
page.h microblaze: Removing dead CONTIGUOUS_PAGE_ALLOC config option 2010-10-21 15:51:31 +10:00
param.h
parport.h
pci-bridge.h of/pci: move of_irq_map_pci() into generic code 2011-02-04 11:46:50 -07:00
pci.h microblaze: use asm-generic/pci-dma-compat.h 2010-10-21 15:51:37 +10:00
percpu.h
pgalloc.h microblaze: Fix pmd_populate macro 2010-10-21 15:51:20 +10:00
pgtable.h microblaze: Fix pte_update function 2011-02-07 19:12:30 +01:00
poll.h
posix_types.h
processor.h microblaze: Remove segment.h 2010-04-01 08:38:19 +02:00
prom.h of/pci: move of_irq_map_pci() into generic code 2011-02-04 11:46:50 -07:00
ptrace.h microblaze: Add PT_ macros for special purpose regs 2010-01-18 16:35:39 +01:00
pvr.h microblaze: Correct PVR access macros 2011-01-03 10:01:29 +01:00
registers.h
resource.h
scatterlist.h remove needless ISA_DMA_THRESHOLD 2010-08-07 18:15:50 +02:00
seccomp.h microblaze: Add seccomp support 2010-10-21 15:51:25 +10:00
sections.h
selfmod.h
sembuf.h
serial.h
setup.h microblaze: remove early printk uarlite console dependency from header 2010-10-21 15:51:48 +10:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
socket.h
sockios.h
stat.h
statfs.h
string.h
swab.h
syscall.h
syscalls.h
system.h Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze 2010-08-05 08:59:22 -07:00
termbits.h
termios.h
thread_info.h microblaze: remove unused TIF_KERNEL_TRACE 2010-10-21 15:51:26 +10:00
timex.h
tlb.h microblaze: Fix missing pagemap.h 2011-01-16 14:29:21 +01:00
tlbflush.h microblaze: Fix TLB macros 2010-04-01 08:38:24 +02:00
topology.h of: Provide default of_node_to_nid() implementation. 2010-07-30 00:03:58 -06:00
types.h
uaccess.h microblaze: Fix __copy_to/from_user_inatomic macros 2010-08-02 10:44:03 +02:00
ucontext.h
unaligned.h microblaze: Add support for little-endian Microblaze 2010-10-21 15:51:59 +10:00
unistd.h microblaze: wire up prlimit64 and fanotify* syscalls 2010-10-21 15:51:38 +10:00
unwind.h microblaze: Add stack unwinder 2010-08-04 10:22:35 +02:00
user.h
vga.h
xor.h