Benjamin Herrenschmidt bcd6acd51f Merge commit 'origin/master' into next ...

Conflicts:
	include/linux/kvm.h

2009-12-09 17:14:38 +11:00

..

base.c

…

device.c

…

gpio.c

…

Kconfig

…

Makefile

…

of_i2c.c

…

of_mdio.c

…

of_spi.c

…

platform.c

…