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
..
mscan	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
sja1000	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-05-20 21:26:12 -07:00
at91_can.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
bfin_can.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
dev.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kconfig	can: CAN_MCP251X should depend on HAS_DMA	2009-12-13 19:56:36 -08:00
Makefile
mcp251x.c	net: trans_start cleanups	2010-05-10 05:01:31 -07:00
ti_hecc.c	Fix some #includes in CAN drivers (rebased for net-next-2.6)	2010-04-13 03:32:42 -07:00
vcan.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00