Merge branch 'lpc32xx/fixes-non-critical' of git://git.antcom.de/linux-2.6 into next...
authorArnd Bergmann <arnd@arndb.de>
Mon, 27 Feb 2012 17:59:05 +0000 (17:59 +0000)
committerArnd Bergmann <arnd@arndb.de>
Mon, 27 Feb 2012 17:59:11 +0000 (17:59 +0000)
commita0008bf73c12212769b0d0b19cdec5c432de94ba
treee53c67efd4aad97ab9f2addc1fc0d62879b41c55
parent5a8c271b26b83a09924c99aaa5c607021aed142b
parentcfac337b0fbcad5181096ab72bb24a05bd444562
Merge branch 'lpc32xx/fixes-non-critical' of git://git.antcom.de/linux-2.6 into next/fixes-non-critical

* 'lpc32xx/fixes-non-critical' of git://git.antcom.de/linux-2.6: (1 commit)
  ARM: LPC32xx: Fix missing and bad LPC32XX macros

Update to Linux 3.3-rc5

Signed-off-by: Arnd Bergmann <arnd@arndb.de>