Merge AT91, EP93xx, General devel, PXA, S3C, V6+ and Xscale trees

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/common/dmabounce.c
index 4d5b031ac745eb9437fbf9e8df575fa9a01cbca1,2e635b814c14b06dd7cf84cbba4ccc2afd72cf58,2e635b814c14b06dd7cf84cbba4ccc2afd72cf58,2e635b814c14b06dd7cf84cbba4ccc2afd72cf58,2e635b814c14b06dd7cf84cbba4ccc2afd72cf58,2362c498f52ebef5702654da992b70f82bddbbef,2e635b814c14b06dd7cf84cbba4ccc2afd72cf58..6fbe7722aa44086403599f64f26c04aebece4568
--- 1/arch/arm/common/dmabounce.c
--- 2/arch/arm/common/dmabounce.c
--- 3/arch/arm/common/dmabounce.c
--- 4/arch/arm/common/dmabounce.c
--- 5/arch/arm/common/dmabounce.c
--- 6/arch/arm/common/dmabounce.c
--- 7/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
@@@@@@@@ -79,23 -81,33 -81,33 -81,33 -81,33 -81,33 -81,33 +79,23 @@@@@@@@ struct dmabounce_device_info 
        rwlock_t lock;
       };
       
 ------static LIST_HEAD(dmabounce_devs);
 ------
       #ifdef STATS
 ------static void print_alloc_stats(struct dmabounce_device_info *device_info)
 ++++++static ssize_t dmabounce_show(struct device *dev, struct device_attribute *attr,
 ++++++                       char *buf)
       {
 ------ printk(KERN_INFO
 ------         "%s: dmabounce: sbp: %lu, lbp: %lu, other: %lu, total: %lu\n",
 ------         device_info->dev->bus_id,
 ------         device_info->small.allocs, device_info->large.allocs,
 ++++++ struct dmabounce_device_info *device_info = dev->archdata.dmabounce;
 ++++++ return sprintf(buf, "%lu %lu %lu %lu %lu %lu\n",
 ++++++         device_info->small.allocs,
 ++++++         device_info->large.allocs,
                device_info->total_allocs - device_info->small.allocs -
                        device_info->large.allocs,
 ------         device_info->total_allocs);
 ++++++         device_info->total_allocs,
 ++++++         device_info->map_op_count,
 ++++++         device_info->bounce_count);
       }
 ------#endif
 ---- -
 ---- -/* find the given device in the dmabounce device list */
 ---- -static inline struct dmabounce_device_info *
 ---- -find_dmabounce_dev(struct device *dev)
 ---- -{
 ---- - struct dmabounce_device_info *d;
       
     - /* find the given device in the dmabounce device list */
     - static inline struct dmabounce_device_info *
     - find_dmabounce_dev(struct device *dev)
     - {
     -  struct dmabounce_device_info *d;
     - 
 ------ list_for_each_entry(d, &dmabounce_devs, node)
 ------         if (d->dev == dev)
 ------                 return d;
 ------
 ------ return NULL;
 ------}
 ++++++static DEVICE_ATTR(dmabounce_stats, 0400, dmabounce_show, NULL);
 ++++++#endif
       
       
       /* allocate a 'safe' buffer and keep track of it */

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc include/asm-arm/arch-pxa/pxa-regs.h
Simple merge

diff --cc include/asm-arm/dma-mapping.h
Simple merge