From: Linus Torvalds Date: Thu, 6 May 2010 15:38:20 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze X-Git-Tag: firefly_0821_release~9833^2~2217 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e8e8fade7b351f131433fa44ca5d4e960e1c0f9c;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Defconfig update microblaze: Optimize CACHE_LOOP_LIMITS and CACHE_RANGE_LOOP macros microblaze: Fix consistent-sync code microblaze: Define correct L1_CACHE_SHIFT value microblaze: cpuinfo shows cache line length microblaze: Fix kmalloc alignment on non-coherent DMA platforms microblaze: Fix typo fault in cache code microblaze: Fix consistent code microblaze: pci-dma: use include/linux/dma-mapping.h microblaze: page.h: Remove get_user_page and free_user_page microblaze: Remove "cache" optimized copy_page function microblaze: invoke oom-killer from page fault microblaze: fix divide by zero exception message microblaze: Add isa_dma_bridge_buggy to dma.h microblaze: Remove ancient code microblaze: Quiet section mismatch warnings for MMU version microblaze: Quiet section mismatch warnings microblaze: Fix IRQ entry/exit ftracing microblaze: resource/PCI: align functions now return start of resource microblaze: PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs --- e8e8fade7b351f131433fa44ca5d4e960e1c0f9c