Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / mach-sa1100 / leds-lart.c