summaryrefslogtreecommitdiffstats
path: root/include/asm-m68k/nubus.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-11 02:21:57 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-11 02:21:57 +0200
commitb4dfd6bc35f6c1e0fcbb4268c523b3939955d3af (patch)
tree2b33ae37af2c77fd844243165d00a47450cfc543 /include/asm-m68k/nubus.h
parentMerge branch 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/dave... (diff)
parent[IA64] SGI Altix : fix pcibr_dmamap_ate32() bug (diff)
downloadlinux-b4dfd6bc35f6c1e0fcbb4268c523b3939955d3af.tar.xz
linux-b4dfd6bc35f6c1e0fcbb4268c523b3939955d3af.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] SGI Altix : fix pcibr_dmamap_ate32() bug [IA64] Fix CPU freq displayed in /proc/cpuinfo [IA64] Fix wrong assumption about irq and vector in msi_ia64.c [IA64] BTE error timer fix
Diffstat (limited to 'include/asm-m68k/nubus.h')
0 files changed, 0 insertions, 0 deletions