kevin/linux
1
Fork 0
Code
869759b9e4
linux/arch/arm/include/asm
History
David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
2011-11-21 13:50:33 -05:00
..
hardware ARM: 7156/1: l2x0: fix compile error on !CONFIG_USE_OF 2011-11-12 11:32:34 +00:00
mach ARM: 7155/1: arch.h: Declare 'pt_regs' locally 2011-11-09 21:53:36 +00:00
a.out-core.h
a.out.h
asm-offsets.h
assembler.h ARM: assembler.h: Add string declaration macro 2011-07-07 15:31:05 +01:00
atomic.h atomic: cleanup asm-generic atomic*.h inclusion 2011-07-26 16:49:47 -07:00
bitops.h asm-generic: add another generic ext2 atomic bitops 2011-07-26 16:49:46 -07:00
bug.h ARM: 7017/1: Use generic BUG() handler 2011-10-17 09:13:41 +01:00
bugs.h
byteorder.h
cache.h
cacheflush.h
cachetype.h ARM: 7062/1: cache: detect PIPT I-cache using CTR 2011-10-17 09:13:41 +01:00
checksum.h
clkdev.h ARM: Consolidate the clkdev header files 2011-07-19 18:09:45 +02:00
cpu.h
cputype.h ARM: 7011/1: Add ARM cpu topology definition 2011-10-17 09:02:43 +01:00
current.h
delay.h
device.h Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:11:00 -07:00
div64.h
dma-mapping.h Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
dma.h locking, ARM: Annotate low level hw locks as raw 2011-09-13 11:12:14 +02:00
domain.h
ecard.h ARM: io: ecard: move ioaddr() inside __ecard_address 2011-08-17 08:44:16 +01:00
elf.h ARM: 6883/1: ptrace: Migrate to regsets framework 2011-05-14 21:36:55 +01:00
entry-macro-multi.S ARM: gic: consolidate PPI handling 2011-10-23 13:32:29 +01:00
entry-macro-vic2.S
exception.h ARM: 7115/4: move __exception and friends to asm/exception.h 2011-10-17 09:02:44 +01:00
fb.h
fcntl.h
fiq.h ARM: 6940/1: fiq: Briefly document driver responsibilities for suspend/resume 2011-05-26 10:31:06 +01:00
fixmap.h
flat.h
floppy.h
fncpy.h
fpstate.h Fix common misspellings 2011-03-31 11:26:23 -03:00
ftrace.h
futex.h ARM: 7099/1: futex: preserve oldval in SMP __futex_atomic_op 2011-09-26 12:36:47 +01:00
glue-cache.h Fix common misspellings 2011-03-31 11:26:23 -03:00
glue-df.h
glue-pf.h
glue-proc.h
glue.h Fix common misspellings 2011-03-31 11:26:23 -03:00
gpio.h ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
hardirq.h ARM: gic: consolidate PPI handling 2011-10-23 13:32:29 +01:00
highmem.h
hw_breakpoint.h ARM: hw_breakpoint: add support for multiple watchpoints 2011-08-31 10:42:48 +01:00
hw_irq.h arm: dove: Use proper irq accessor functions 2011-03-29 14:47:57 +02:00
hwcap.h ARM: hwcaps: add new HWCAP defines for ARMv7-A 2011-07-07 19:20:51 +01:00
ide.h
io.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-10-25 12:11:02 +02:00
ioctls.h
ipcbuf.h
irq.h ARM: introduce handle_IRQ() not to dump exception stack 2011-07-12 19:42:40 +08:00
irqflags.h
Kbuild ARM: 7006/1: Migrate to asm-generic wrapper support 2011-10-17 09:12:40 +01:00
kexec.h
kgdb.h
kmap_types.h
kprobes.h ARM: kprobes: Extend arch_specific_insn to add pointer to emulated instruction 2011-07-13 17:32:42 +00:00
leds.h
limits.h
linkage.h
localtimer.h Merge branch 'dt/gic' into next/dt 2011-10-31 14:08:10 +01:00
locks.h
mach-types.h
mc146818rtc.h
memblock.h
memory.h ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H 2011-10-13 12:53:53 -04:00
mman.h
mmu_context.h
mmu.h locking, ARM: Annotate low level hw locks as raw 2011-09-13 11:12:14 +02:00
module.h ARM: 7013/1: P2V: Remove ARM_PATCH_PHYS_VIRT_16BIT 2011-08-13 11:26:40 +01:00
msgbuf.h
mtd-xip.h
mutex.h
nwflash.h
outercache.h ARM: 7114/1: cache-l2x0: add resume entry for l2 in secure mode 2011-10-17 09:11:51 +01:00
page-nommu.h
page.h ARM: 7075/1: LPAE: Factor out 2-level page table definitions into separate files 2011-10-06 15:40:05 +01:00
param.h
parport.h
pci.h ARM: convert PCI defines to variables 2011-07-12 11:19:29 -05:00
perf_event.h ARM: perf: add support for the Cortex-A15 PMU 2011-07-07 19:20:53 +01:00
pgalloc.h ARM: 7076/1: LPAE: Add (pte|pmd)val_t type definitions as u32 2011-10-06 15:40:05 +01:00
pgtable-2level-hwdef.h ARM: 7077/1: LPAE: Use a mask for physical addresses in page table entries 2011-10-06 15:40:06 +01:00
pgtable-2level-types.h ARM: 7076/1: LPAE: Add (pte|pmd)val_t type definitions as u32 2011-10-06 15:40:05 +01:00
pgtable-2level.h ARM: 7075/1: LPAE: Factor out 2-level page table definitions into separate files 2011-10-06 15:40:05 +01:00
pgtable-hwdef.h ARM: 7075/1: LPAE: Factor out 2-level page table definitions into separate files 2011-10-06 15:40:05 +01:00
pgtable-nommu.h
pgtable.h Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-28 12:02:27 -07:00
pmu.h ARM: perf: move arm_pmu into <asm/pmu.h> 2011-08-31 10:50:13 +01:00
posix_types.h
proc-fns.h ARM: pm: convert some assembly to C 2011-09-20 23:33:44 +01:00
processor.h
procinfo.h
prom.h irq: add irq_domain translation infrastructure 2011-07-28 01:32:04 -06:00
ptrace.h ARM: ptrace: Add APSR_MASK definition to ptrace.h 2011-07-13 17:32:43 +00:00
scatterlist.h ARM: Allow SoCs to enable scatterlist chaining 2011-06-02 11:16:22 +01:00
sched_clock.h
seccomp.h
segment.h
sembuf.h
serial.h
setup.h Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', 'suspend' and 'vfp' into for-next 2011-07-22 23:08:48 +01:00
shmbuf.h
shmparam.h
sigcontext.h
signal.h
smp_plat.h
smp_scu.h
smp_twd.h ARM: gic, local timers: use the request_percpu_irq() interface 2011-10-23 13:32:33 +01:00
smp.h ARM: gic: consolidate PPI handling 2011-10-23 13:32:29 +01:00
socket.h net: add wireless TX status socket option 2011-11-09 16:01:02 -05:00
sockios.h
sparsemem.h
spinlock_types.h
spinlock.h ARM: 6939/1: fix missing 'cpu_relax()' declaration 2011-05-23 17:19:26 +01:00
stackprotector.h
stacktrace.h
stat.h
statfs.h
string.h
suspend.h ARM: pm: preallocate a page table for suspend/resume 2011-09-20 23:33:36 +01:00
swab.h
system.h Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
tcm.h ARM: 6985/1: export functions to determine the presence of I/DTCM 2011-07-06 20:49:45 +01:00
termbits.h
termios.h
therm.h
thread_info.h
thread_notify.h ARM: 6867/1: Introduce THREAD_NOTIFY_COPY for copy_thread() hooks 2011-04-10 21:13:36 +01:00
timex.h
tlb.h arm: mmu_gather rework 2011-05-25 08:39:14 -07:00
tlbflush.h ARM: 7076/1: LPAE: Add (pte|pmd)val_t type definitions as u32 2011-10-06 15:40:05 +01:00
tls.h
topology.h ARM: 7011/1: Add ARM cpu topology definition 2011-10-17 09:02:43 +01:00
traps.h ARM: 7004/1: fix traps.h compile warnings 2011-07-22 17:19:02 +01:00
types.h remove dma64_addr_t 2011-03-23 19:47:18 -07:00
uaccess.h
ucontext.h Fix common misspellings 2011-03-31 11:26:23 -03:00
unaligned.h
unified.h
unistd.h ARM: wire up process_vm_writev and process_vm_readv syscalls 2011-11-17 16:58:00 +00:00
unwind.h
user.h
vfp.h
vfpmacros.h
vga.h ARM: set vga memory base at run-time 2011-07-12 11:19:29 -05:00
xor.h