diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-16 10:48:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-16 10:48:23 -0700 |
| commit | 69d1d523cc961b6f3c2fe313694263fc81ada231 (patch) | |
| tree | 207118ff51e133b1308d37e1d14365b5b0f2ecb2 /include/pcmcia/mem_op.h | |
| parent | 9a9e0d685553af76cb6ae2af93cca4913e7fcd47 (diff) | |
| parent | 56ee0cfd095eab246c0ecd4398c4f30a546663f7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
[PARISC] make ptr_to_pide() static
[PARISC] head.S: section mismatch fixes
[PARISC] add back Crestone Peak cpu
[PARISC] futex: special case cmpxchg NULL in kernel space
[PARISC] clean up show_stack
[PARISC] add pa8900 CPUs to hardware inventory
[PARISC] clean up include/asm-parisc/elf.h
[PARISC] move defconfig to arch/parisc/configs/
[PARISC] add back AD1889 MAINTAINERS entry
[PARISC] pdc_console: fix bizarre panic on boot
[PARISC] dump_stack in show_regs
[PARISC] pdc_stable: fix compile errors
[PARISC] remove unused pdc_iodc_printf function
[PARISC] bump __NR_syscalls
[PARISC] unbreak pgalloc.h
[PARISC] move VMALLOC_* definitions to fixmap.h
[PARISC] wire up timerfd syscalls
[PARISC] remove old timerfd syscall
Diffstat (limited to 'include/pcmcia/mem_op.h')
0 files changed, 0 insertions, 0 deletions