summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/shmbuf.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-04 17:15:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-04 17:15:07 -0700
commit5941de8eadc287f3f47b87ce9888734ee07d210b (patch)
tree2f5a8e84c33ae2df61e4e807798a153d6b7f6fbb /arch/ia64/include/asm/shmbuf.h
parentc44df7413fd711bca818111b94cbd7ce5f3600a9 (diff)
parentc6557e7f2b6ae76a44653d38f835174074c42e05 (diff)
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] move include/asm-s390 to arch/s390/include/asm
Diffstat (limited to 'arch/ia64/include/asm/shmbuf.h')
0 files changed, 0 insertions, 0 deletions