Arnd Bergmann 863e99a8c1 Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci ... As Stephen Rothwell reports, a849088aa1 ("ARM: Fix ioremap() of address zero") from the arm-current tree and commit c279443709 ("ARM: Add fixed PCI i/o mapping") from the arm-soc tree conflict in a nontrivial way in arch/arm/mm/mmu.c. Rob Herring explains: The PCI i/o reserved area has a dummy physical address of 0 and needs to be skipped by ioremap searches. So we don't set VM_ARM_STATIC_MAPPING to prevent matches by ioremap. The vm_struct settings don't really matter when we do the real mapping of the i/o space. Since commit a849088aa1 is at the start of the fixes branch in the arm tree, we can merge it into the branch that contains the other ioremap changes. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Russell King <rmk+kernel@arm.linux.org.uk>		2012-09-04 15:01:37 +02:00
..
algos	i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING	2012-05-30 10:55:34 +02:00
busses	Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci	2012-09-04 15:01:37 +02:00
muxes	i2c: Update Guenter Roeck's e-mail address	2012-07-24 14:13:56 +02:00
i2c-boardinfo.c	i2c: Update the FSF address	2012-03-26 21:47:19 +02:00
i2c-core.c	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-30 19:03:41 -07:00
i2c-core.h	i2c: Update the FSF address	2012-03-26 21:47:19 +02:00
i2c-dev.c	i2c-dev: Add support for I2C_M_RECV_LEN	2012-05-30 10:55:34 +02:00
i2c-mux.c	i2c/of: Automatically populate i2c mux busses from device tree data.	2012-05-12 14:28:16 +02:00
i2c-smbus.c	i2c-smbus: Use module_i2c_driver()	2012-07-24 14:13:57 +02:00
Kconfig	i2c: muxes are not EXPERIMENTAL anymore	2012-05-12 14:28:16 +02:00
Makefile	i2c: Deprecate i2c_driver.attach_adapter and .detach_adapter	2011-03-20 14:50:53 +01:00