From: Linus Torvalds Date: Tue, 21 Mar 2006 17:20:47 +0000 (-0800) Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=28c006c1f09ea92d4f2585a087a188955ce3f64c;p=openwrt%2Fstaging%2Fblogic.git 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 --- 28c006c1f09ea92d4f2585a087a188955ce3f64c