summaryrefslogtreecommitdiffstats
path: root/include/asm-sh/bug.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 19:28:17 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 19:28:17 +0200
commit57b1494d2ba544c62673234da6115c21fac27ffc (patch)
tree34f91f3187805fa034f8e63966d471ba2498d148 /include/asm-sh/bug.h
parentMerge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff)
parentgeneric, x86: fix add iommu_num_pages helper function (diff)
downloadlinux-57b1494d2ba544c62673234da6115c21fac27ffc.tar.xz
linux-57b1494d2ba544c62673234da6115c21fac27ffc.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: generic, x86: fix add iommu_num_pages helper function x86: remove stray <6> in BogoMIPS printk x86: move dma32_reserve_bootmem() after reserve_crashkernel()
Diffstat (limited to 'include/asm-sh/bug.h')
0 files changed, 0 insertions, 0 deletions