dect
/
linux-2.6
Archived
13
0
Fork 0
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/drivers/net/ehea
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
..
Makefile
ehea.h ehea: fix possible DLPAR/mem deadlock 2010-04-21 22:32:44 -07:00
ehea_ethtool.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
ehea_hw.h ehea: fix ehea.h checkpatch complaints 2008-02-03 04:25:55 -08:00
ehea_main.c Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
ehea_phyp.c net/ehea: use consistant type 2009-01-06 10:47:16 -08:00
ehea_phyp.h powerpc: Move ehea hcall definitions into hvcall.h 2009-11-24 14:33:03 +11:00
ehea_qmr.c ehea: error handling improvement 2010-04-21 22:32:43 -07:00
ehea_qmr.h ehea: error handling improvement 2010-04-21 22:32:43 -07:00