aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-parisc/assembly.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-27 12:30:52 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-27 12:30:52 -0400
commitd96a2a5c6479342229416565944b56bc7a2b1a60 (patch)
treea17556ff042e739973decf0f4d1a21712e409520 /include/asm-parisc/assembly.h
parent50c46637aa894f904e2fb39086a3d7732f68bd50 (diff)
parent81b4b98ae484f11d97b3d5b8e88d916b74055b78 (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] Add NOTES section [PARISC] Use compat_sys_getdents [PARISC] Do not allow STI_CONSOLE to be modular [PARISC] Clean up sti_flush [PARISC] Add dummy isa_(bus|virt)_to_(virt|bus) inlines [PARISC] Add empty <asm-parisc/vga.h>
Diffstat (limited to 'include/asm-parisc/assembly.h')
0 files changed, 0 insertions, 0 deletions