aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-mips/asmmacro.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-07 17:02:29 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-07 17:02:29 -0700
commitc52ecdab06ff3b4d0f8914951eb74dc8b049f51c (patch)
tree291a55adb3be3fec45dcc6affa72d9d1244ba42a /include/asm-mips/asmmacro.h
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
parent[ARM] pxa: fix pxa27x keyboard driver (diff)
downloadlinux-dev-c52ecdab06ff3b4d0f8914951eb74dc8b049f51c.tar.xz
linux-dev-c52ecdab06ff3b4d0f8914951eb74dc8b049f51c.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] pxa: fix pxa27x keyboard driver [ARM] Fix 4417/1: Serial: Fix AMBA drivers locking [ARM] 4421/1: AT91: Value of _KEY fields. [ARM] Solve buggy smp_processor_id() usage [ARM] 4422/1: Fix default value handling in gpio_direction_output (PXA) [ARM] 4419/1: AT91: SAM9 USB clocks check for suspending [ARM] 4418/1: AT91: Number of programmable clocks differs [ARM] 4392/2: Do not corrupt the SP register in compressed/head.S
Diffstat (limited to 'include/asm-mips/asmmacro.h')
0 files changed, 0 insertions, 0 deletions