From: Linus Torvalds Date: Thu, 17 Dec 2009 23:53:41 +0000 (-0800) Subject: Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm X-Git-Tag: Ubuntu-5.0.0-8.9~24683 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a695bc683609a2b815915e4cfcd93e4ccc0e2cae;p=mirror_ubuntu-disco-kernel.git Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: PCMCIA: fix pxa2xx_lubbock modular build error [ARM] Update mach-types [ARM] pxa: fix no reference of cpu_is_pxa25x() in devices.c [ARM] pxa/cm-x300: add PWM backlight support revert "[ARM] pxa/cm-x300: add PWM backlight support" ARM: use flush_kernel_dcache_area() for dmabounce ARM: add size argument to __cpuc_flush_dcache_page ARM: 5848/1: kill flush_ioremap_region() ARM: cache-l2x0: make better use of background cache handling ARM: cache-l2x0: avoid taking spinlock for every iteration [ARM] Kirkwood: Add LaCie Network Space v2 support ARM: dove: fix the mm mmu flags of the pj4 procinfo --- a695bc683609a2b815915e4cfcd93e4ccc0e2cae