| commit | 28c006c1f09ea92d4f2585a087a188955ce3f64c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue Mar 21 09:20:47 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue Mar 21 09:20:47 2006 -0800 |
| tree | 2615749653cd3ba4852d2f5ed22f21eec0cd5712 | |
| parent | cbe037b46f564188045937e6006c5c1d6093618a [diff] | |
| parent | 7abe53155b77c31028a7158883bc9aac705790da [diff] |
Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] Fix cosmetic typo in asm/irq.h [ARM] 3367/1: CLCD mode no longer supported on the RealView boards [ARM] 3366/1: Allow the 16bpp mode configuration in the CLCD control register