aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-07 17:32:57 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-07 17:32:57 -0700
commit9d21f09ca03d1142f1988001f228d02581d8986c (patch)
treeae2d485159ac4c3cbc2e4e5269434236c2de9104 /arch/sparc
parentf5b40e363ad6041a96e3da32281d8faa191597b9 (diff)
parent74fae122eb9f0db8b8718b9851c31c2f374fb134 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3507/1: Replace map_desc.physical with map_desc.pfn: aaed2000 [ARM] 3506/1: aaec2000: debug-macro.S needs hardware.h [ARM] 3505/1: aaec2000: entry-macro.S needs asm/arch/irqs.h [ARM] 3504/1: Fix clcd includes for aaec2000 [ARM] 3503/1: Fix map_desc structure for aaec2000 [ARM] 3501/1: i.MX: fix lowlevel debug macros [ARM] rtc-sa1100: fix compiler warnings and error cleanup [ARM] Allow SA1100 RTC alarm to be configured for wakeup
Diffstat (limited to 'arch/sparc')
0 files changed, 0 insertions, 0 deletions