Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ... Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge. Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>		2010-05-22 00:36:56 -06:00
..
amso1100	RDMA/amso1100: Use the dma state API instead of pci equivalents	2010-04-21 15:23:10 -07:00
cxgb3	RDMA/cxgb3: Shrink .text with compile-time init of handlers arrays	2010-04-28 14:57:40 -07:00
cxgb4	MAINTAINERS: Add cxgb4 and iw_cxgb4 entries	2010-05-05 14:45:40 -07:00
ehca	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
ipath	Merge branch 'master' into for-next	2010-04-23 02:08:44 +02:00
mlx4	IB/mlx4: Add support for masked atomic operations	2010-04-21 16:37:49 -07:00
mthca	IB/mthca: Use the dma state API instead of pci equivalents	2010-04-21 15:25:34 -07:00
nes	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00