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
..
core	Merge branches 'amso1100', 'bkl', 'cma', 'cxgb3', 'cxgb4', 'ipoib', 'iser', 'masked-atomics', 'misc', 'mthca' and 'nes' into for-next	2010-05-15 20:06:01 -07:00
hw	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
ulp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
Kconfig	RDMA/cxgb4: Add driver for Chelsio T4 RNIC	2010-04-21 15:30:06 -07:00
Makefile	RDMA/cxgb4: Add driver for Chelsio T4 RNIC	2010-04-21 15:30:06 -07:00