tree ae2d485159ac4c3cbc2e4e5269434236c2de9104
parent f5b40e363ad6041a96e3da32281d8faa191597b9
parent 74fae122eb9f0db8b8718b9851c31c2f374fb134
author Linus Torvalds <torvalds@g5.osdl.org> 1147048377 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1147048377 -0700

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